Ignore:
Timestamp:
2008-07-28T16:53:09+12:00 (16 years ago)
Author:
davidb
Message:

Mods to Makefile.in and configure.in to work with newly organized files: gs2build gs2common and gs2runtime

Location:
gsdl/trunk/gs2runtime/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • gsdl/trunk/gs2runtime/src/colservr/Makefile.in

    r15907 r16563  
    2525###########################################################################
    2626
    27 GSDL_DIR = ../..
    28 INDEXERS_DIR = $(GSDL_DIR)/indexers
    29 PACKAGES_DIR = $(GSDL_DIR)/packages
     27GSDL_DIR = ../../..
     28COMMON_DIR = $(GSDL_DIR)/gs2common
     29
     30INDEXERS_DIR = $(COMMON_DIR)/indexers
     31PACKAGES_DIR = $(GSDL_DIR)/gs2runtime/packages
    3032
    3133
    … …  
    4749DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(SQLITE_DEFINES)
    4850# Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist!
    49 INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/src/lib \
     51INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib \
    5052    -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mg/src/text \
    5153    -I$(INDEXERS_DIR)/mgpp/lib -I$(INDEXERS_DIR)/mgpp/text \

  • gsdl/trunk/gs2runtime/src/oaiservr/Makefile.in

    r15907 r16563  
    2525###########################################################################
    2626
    27 GSDL_DIR = ../..
    28 INDEXERS_DIR = $(GSDL_DIR)/indexers
    29 PACKAGES_DIR = $(GSDL_DIR)/packages
    30 COLSERVR_DIR = $(GSDL_DIR)/src/colservr
    31 PROTOCOL_DIR = $(GSDL_DIR)/src/protocol
    32 RECPT_DIR = $(GSDL_DIR)/src/recpt
     27GSDL_DIR = ../../..
     28COMMON_DIR = $(GSDL_DIR)/gs2common
     29RUNTIME_DIR = $(GSDL_DIR)/gs2runtime
     30
     31INDEXERS_DIR = $(COMMON_DIR)/indexers
     32PACKAGES_DIR = $(RUNTIME_DIR)/packages
     33COLSERVR_DIR = $(RUNTIME_DIR)/src/colservr
     34PROTOCOL_DIR = $(RUNTIME_DIR)/src/protocol
     35RECPT_DIR = $(RUNTIME_DIR)/src/recpt
    3336
    3437
    … …  
    4245USE_SQLITE = @USE_SQLITE@
    4346ifeq ($(USE_SQLITE), 1)
    44 SQLITE_LIBS = $(PACKAGES_DIR)/sqlite/lib/libsqlite3.a -ldl -lpthread
     47SQLITE_LIBS = $(COMMON_DIR)/packages/sqlite/lib/libsqlite3.a -ldl -lpthread
    4548else
    4649SQLITE_LIBS =
    … …  
    5255CXX = @CXX@
    5356CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    54 INCLUDES = -I$(GSDL_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) -I$(INDEXERS_DIR)/mgpp/text
     57INCLUDES = -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) -I$(INDEXERS_DIR)/mgpp/text
    5558LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    5659LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
    … …  
    118121    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
    119122    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a \
    120     $(GSDL_DIR)/src/lib/gsdllib.a
     123    $(COMMON_DIR)/src/lib/gsdllib.a
    121124
    122125EXECUTABLE_OBJECTS = \

  • gsdl/trunk/gs2runtime/src/protocol/Makefile.in

    r15907 r16563  
    2525###########################################################################
    2626
    27 GSDL_DIR = ../..
    28 INDEXERS_DIR = $(GSDL_DIR)/indexers
    29 PACKAGES_DIR = $(GSDL_DIR)/packages
    30 COLSERVR_DIR = $(GSDL_DIR)/src/colservr
     27GSDL_DIR = ../../..
     28COMMON_DIR = $(GSDL_DIR)/gs2common
     29
     30INDEXERS_DIR = $(COMMON_DIR)/indexers
     31PACKAGES_DIR = $(GSDL_DIR)/gs2runtime/packages
     32COLSERVR_DIR = $(GSDL_DIR)/gs2runtime/src/colservr
    3133
    3234
    … …  
    3638DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER
    3739# Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist!
    38 INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/src/lib -I$(COLSERVR_DIR) -I$(INDEXERS_DIR)/mgpp/text
     40INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(INDEXERS_DIR)/mgpp/text
    3941RANLIB = @RANLIB@
    4042

  • gsdl/trunk/gs2runtime/src/recpt/Makefile.in

    r16323 r16563  
    2525###########################################################################
    2626
    27 GSDL_DIR = ../..
    28 INDEXERS_DIR = $(GSDL_DIR)/indexers
    29 PACKAGES_DIR = $(GSDL_DIR)/packages
    30 COLSERVR_DIR = $(GSDL_DIR)/src/colservr
    31 PROTOCOL_DIR = $(GSDL_DIR)/src/protocol
    32 Z3950_DIR = $(GSDL_DIR)/src/z3950
     27GSDL_DIR = ../../..
     28COMMON_DIR = $(GSDL_DIR)/gs2common
     29RUNTIME_DIR = $(GSDL_DIR)/gs2runtime
     30
     31INDEXERS_DIR = $(COMMON_DIR)/indexers
     32PACKAGES_DIR = $(RUNTIME_DIR)/packages
     33COLSERVR_DIR = $(RUNTIME_DIR)/src/colservr
     34PROTOCOL_DIR = $(RUNTIME_DIR)/src/protocol
     35Z3950_DIR = $(RUNTIME_DIR)/src/z3950
    3336
    3437
    … …  
    5356USE_SQLITE = @USE_SQLITE@
    5457ifeq ($(USE_SQLITE), 1)
    55 SQLITE_LIBS = $(PACKAGES_DIR)/sqlite/lib/libsqlite3.a -ldl -lpthread
     58SQLITE_LIBS = $(COMMON_DIR)/packages/sqlite/lib/libsqlite3.a -ldl -lpthread
    5659else
    5760SQLITE_LIBS =
    … …  
    7679CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    7780DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H $(FASTCGI_DEFS) $(Z3950_DEFS)
    78 INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/src/lib \
     81INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib \
    7982        -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \
    8083    -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mgpp/text \
    … …  
    194197    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
    195198    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a \
    196     $(GSDL_DIR)/src/lib/gsdllib.a
     199    $(COMMON_DIR)/src/lib/gsdllib.a
    197200
    198201EXECUTABLE_OBJECTS = \
Note: See TracChangeset for help on using the changeset viewer.