Changeset 18224
- Timestamp:
- 2008-12-17T14:32:32+13:00 (15 years ago)
- Location:
- gsdl/trunk
- Files:
-
- 8 edited
-
common-src/src/gdbmedit/db2txt/Makefile.in (modified) (3 diffs)
-
common-src/src/gdbmedit/gdbmget/Makefile.in (modified) (3 diffs)
-
common-src/src/gdbmedit/gdbmset/Makefile.in (modified) (3 diffs)
-
common-src/src/gdbmedit/txt2db/Makefile.in (modified) (3 diffs)
-
common-src/src/lib/Makefile.in (modified) (3 diffs)
-
runtime-src/src/colservr/Makefile.in (modified) (4 diffs)
-
runtime-src/src/protocol/Makefile.in (modified) (3 diffs)
-
runtime-src/src/recpt/Makefile.in (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
gsdl/trunk/common-src/src/gdbmedit/db2txt/Makefile.in
r18029 r18224 1 1 ########################################################################### 2 2 # 3 # Makefile -- src/gdbmedit/db2txt3 # Makefile -- common-src/src/gdbmedit/db2txt 4 4 # A component of the Greenstone digital library software 5 5 # from the New Zealand Digital Library Project at the … … 27 27 GSDL_DIR = ../../../.. 28 28 COMMON_DIR = $(GSDL_DIR)/common-src 29 GDBM_DIR = $(COMMON_DIR)/packages/gdbm 29 30 COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages 31 30 32 31 33 CXX = @CXX@ … … 33 35 DEFS = @DEFS@ 34 36 GSDLOS = @gsdlos@ 35 INCLUDES = -I$( GDBM_DIR)/include -I$(COMMON_DIR)/src/lib37 INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib 36 38 INSTALL = @INSTALL@ 37 39 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 38 LIBS = @LIBS@ $( GDBM_DIR)/lib/libgdbm.a40 LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a 39 41 40 42 -
gsdl/trunk/common-src/src/gdbmedit/gdbmget/Makefile.in
r18029 r18224 1 1 ########################################################################### 2 2 # 3 # Makefile -- src/gdbmedit/gdbmget3 # Makefile -- common-src/src/gdbmedit/gdbmget 4 4 # A component of the Greenstone digital library software 5 5 # from the New Zealand Digital Library Project at the … … 27 27 GSDL_DIR = ../../../.. 28 28 COMMON_DIR = $(GSDL_DIR)/common-src 29 GDBM_DIR = $(COMMON_DIR)/packages/gdbm 29 30 COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages 31 30 32 31 33 CXX = @CXX@ … … 33 35 DEFS = @DEFS@ 34 36 GSDLOS = @gsdlos@ 35 INCLUDES = -I$( GDBM_DIR)/include -I$(COMMON_DIR)/src/lib37 INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib 36 38 INSTALL = @INSTALL@ 37 39 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 38 LIBS = @LIBS@ $( GDBM_DIR)/lib/libgdbm.a40 LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a 39 41 40 42 -
gsdl/trunk/common-src/src/gdbmedit/gdbmset/Makefile.in
r18029 r18224 1 1 ########################################################################### 2 2 # 3 # Makefile -- src/gdbmedit/gdbmset3 # Makefile -- common-src/src/gdbmedit/gdbmset 4 4 # A component of the Greenstone digital library software 5 5 # from the New Zealand Digital Library Project at the … … 27 27 GSDL_DIR = ../../../.. 28 28 COMMON_DIR = $(GSDL_DIR)/common-src 29 GDBM_DIR = $(COMMON_DIR)/packages/gdbm 29 30 COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages 31 30 32 31 33 CXX = @CXX@ … … 33 35 DEFS = @DEFS@ 34 36 GSDLOS = @gsdlos@ 35 INCLUDES = -I$( GDBM_DIR)/include -I$(COMMON_DIR)/src/lib37 INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib 36 38 INSTALL = @INSTALL@ 37 39 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 38 LIBS = @LIBS@ $( GDBM_DIR)/lib/libgdbm.a40 LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a 39 41 40 42 -
gsdl/trunk/common-src/src/gdbmedit/txt2db/Makefile.in
r18029 r18224 1 1 ########################################################################### 2 2 # 3 # Makefile -- src/gdbmedit/txt2db3 # Makefile -- common-src/src/gdbmedit/txt2db 4 4 # A component of the Greenstone digital library software 5 5 # from the New Zealand Digital Library Project at the … … 27 27 GSDL_DIR = ../../../.. 28 28 COMMON_DIR = $(GSDL_DIR)/common-src 29 GDBM_DIR = $(COMMON_DIR)/packages/gdbm 29 30 COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages 31 30 32 31 33 CXX = @CXX@ … … 33 35 DEFS = @DEFS@ 34 36 GSDLOS = @gsdlos@ 35 INCLUDES = -I$( GDBM_DIR)/include -I$(COMMON_DIR)/src/lib37 INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib 36 38 INSTALL = @INSTALL@ 37 39 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 38 LIBS = @LIBS@ $( GDBM_DIR)/lib/libgdbm.a40 LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a 39 41 40 42 -
gsdl/trunk/common-src/src/lib/Makefile.in
r15910 r18224 1 1 ########################################################################### 2 2 # 3 # Makefile -- lib3 # Makefile -- common-src/src/lib 4 4 # A component of the Greenstone digital library software 5 5 # from the New Zealand Digital Library Project at the … … 25 25 ########################################################################### 26 26 27 GSDL_DIR = ../.. 28 INDEXERS_DIR = $(GSDL_DIR)/indexers 29 PACKAGES_DIR = $(GSDL_DIR)/packages 27 GSDL_DIR = ../../.. 28 COMMON_DIR = $(GSDL_DIR)/common-src 29 30 INDEXERS_DIR = $(COMMON_DIR)/indexers 31 COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages 30 32 31 33 32 34 USE_SQLITE = @USE_SQLITE@ 33 35 ifeq ($(USE_SQLITE), 1) 34 SQLITE_INCLUDES = -I$( PACKAGES_DIR)/sqlite/include36 SQLITE_INCLUDES = -I$(COMMON_PACKAGES_DIR)/sqlite/include 35 37 SQLITE_OBJECTS = sqlitedbclass.o 36 38 SQLITE_SOURCES = sqlitedbclass.cpp … … 46 48 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ 47 49 DEFS = @DEFS@ 48 INCLUDES = @GDBM_INCLUDE@ -I$(GSDL_DIR)-I$(INDEXERS_DIR)/mg/lib $(SQLITE_INCLUDES)50 INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(INDEXERS_DIR)/mg/lib $(SQLITE_INCLUDES) 49 51 RANLIB = @RANLIB@ 50 52 -
gsdl/trunk/runtime-src/src/colservr/Makefile.in
r16624 r18224 1 1 ########################################################################### 2 2 # 3 # Makefile -- src/colservr3 # Makefile -- runtime-src/src/colservr 4 4 # A component of the Greenstone digital library software 5 5 # from the New Zealand Digital Library Project at the … … 29 29 30 30 INDEXERS_DIR = $(COMMON_DIR)/indexers 31 COMMON_PACKAGES = $(COMMON_DIR)/packages 32 PACKAGES_DIR = $(GSDL_DIR)/runtime-src/packages 31 COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages 33 32 34 33 … … 36 35 ifeq ($(USE_SQLITE), 1) 37 36 SQLITE_DEFINES = -DUSE_SQLITE 38 SQLITE_INCLUDES = -I$(COMMON_PACKAGES )/sqlite/include37 SQLITE_INCLUDES = -I$(COMMON_PACKAGES_DIR)/sqlite/include 39 38 else 40 39 SQLITE_DEFINES = … … 50 49 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(SQLITE_DEFINES) 51 50 # Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist! 52 INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib\51 INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COMMON_PACKAGES_DIR)/gdbm/include \ 53 52 -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mg/src/text \ 54 53 -I$(INDEXERS_DIR)/mgpp/lib -I$(INDEXERS_DIR)/mgpp/text \ 55 -I$( PACKAGES_DIR)/expat/include $(SQLITE_INCLUDES)54 -I$(COMMON_PACKAGES_DIR)/expat/include $(SQLITE_INCLUDES) 56 55 RANLIB = @RANLIB@ 57 56 -
gsdl/trunk/runtime-src/src/protocol/Makefile.in
r16572 r18224 1 1 ########################################################################### 2 2 # 3 # Makefile -- src/protocol3 # Makefile -- runtime-src/src/protocol 4 4 # A component of the Greenstone digital library software 5 5 # from the New Zealand Digital Library Project at the … … 27 27 GSDL_DIR = ../../.. 28 28 COMMON_DIR = $(GSDL_DIR)/common-src 29 RUNTIME_DIR = $(GSDL_DIR)/runtime-src 29 30 30 31 INDEXERS_DIR = $(COMMON_DIR)/indexers 31 PACKAGES_DIR = $(GSDL_DIR)/runtime-src/packages32 COLSERVR_DIR = $( GSDL_DIR)/runtime-src/src/colservr32 COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages 33 COLSERVR_DIR = $(RUNTIME_DIR)/src/colservr 33 34 34 35 … … 38 39 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER 39 40 # Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist! 40 INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(INDEXERS_DIR)/mgpp/text 41 INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COMMON_PACKAGES_DIR)/gdbm/include \ 42 -I$(COLSERVR_DIR) -I$(INDEXERS_DIR)/mgpp/text 41 43 RANLIB = @RANLIB@ 42 44 -
gsdl/trunk/runtime-src/src/recpt/Makefile.in
r18030 r18224 1 1 ########################################################################### 2 2 # 3 # Makefile -- src/recpt3 # Makefile -- runtime-src/src/recpt 4 4 # A component of the Greenstone digital library software 5 5 # from the New Zealand Digital Library Project at the … … 80 80 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ 81 81 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H $(FASTCGI_DEFS) $(Z3950_DEFS) 82 INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib\82 INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COMMON_PACKAGES_DIR)/gdbm/include \ 83 83 -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \ 84 84 -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mgpp/text \ … … 86 86 INSTALL = @INSTALL@ 87 87 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 88 LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS)\89 $( FASTCGI_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS)88 LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \ 89 $(ACCENTFOLD_LIBS) $(FASTCGI_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS) 90 90 RANLIB = @RANLIB@ 91 91
Note:
See TracChangeset
for help on using the changeset viewer.
