Changeset 18226
- Timestamp:
- 2008-12-17T14:45:37+13:00 (15 years ago)
- Location:
- gsdl/trunk/runtime-src/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
gsdl/trunk/runtime-src/src/corba/Makefile.in
r18030 r18226 1 1 ########################################################################### 2 2 # 3 # Makefile -- src/corba3 # Makefile -- runtime-src/src/corba 4 4 # A component of the Greenstone digital library software 5 5 # from the New Zealand Digital Library Project at the … … 31 31 INDEXERS_DIR = $(COMMON_DIR)/indexers 32 32 COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages 33 PACKAGES_DIR = $(RUNTIME_DIR)/packages33 RUNTIME_PACKAGES_DIR = $(RUNTIME_DIR)/packages 34 34 COLSERVR_DIR = $(RUNTIME_DIR)/src/colservr 35 35 PROTOCOL_DIR = $(RUNTIME_DIR)/src/protocol … … 54 54 MICO_VER = @MICO_VER@ 55 55 ifeq ($(MICO_DIR), default) 56 MICO_INCLUDES = -I$( PACKAGES_DIR)/mico/mico/include57 MICO_PATH = $( PACKAGES_DIR)/mico/bin/56 MICO_INCLUDES = -I$(RUNTIME_PACKAGES_DIR)/mico/mico/include 57 MICO_PATH = $(RUNTIME_PACKAGES_DIR)/mico/bin/ 58 58 else 59 59 ifeq ($(MICO_DIR), yes) … … 75 75 INSTALL = @INSTALL@ 76 76 LDFLAGS = @LDFLAGS@ 77 LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a -L$( PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS)\78 $(SQLITE_LIBS) -L$(PACKAGES_DIR)/mico/lib -lmico$(MICO_VER)77 LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \ 78 $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) -L$(RUNTIME_PACKAGES_DIR)/mico/lib -lmico$(MICO_VER) 79 79 RANLIB = @RANLIB@ 80 80 -
gsdl/trunk/runtime-src/src/oaiservr/Makefile.in
r18030 r18226 1 1 ########################################################################### 2 2 # 3 # Makefile -- src/oaiservr3 # Makefile -- runtime-src/src/oaiservr 4 4 # A component of the Greenstone digital library software 5 5 # from the New Zealand Digital Library Project at the … … 30 30 31 31 INDEXERS_DIR = $(COMMON_DIR)/indexers 32 PACKAGES_DIR = $(RUNTIME_DIR)/packages33 32 COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages 34 33 COLSERVR_DIR = $(RUNTIME_DIR)/src/colservr … … 46 45 USE_SQLITE = @USE_SQLITE@ 47 46 ifeq ($(USE_SQLITE), 1) 48 SQLITE_LIBS = $(COMMON_ DIR)/packages/sqlite/lib/libsqlite3.a -ldl -lpthread47 SQLITE_LIBS = $(COMMON_PACKAGES_DIR)/sqlite/lib/libsqlite3.a -ldl -lpthread 49 48 else 50 49 SQLITE_LIBS = … … 58 57 INCLUDES = -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) -I$(INDEXERS_DIR)/mgpp/text 59 58 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@ 60 LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) 59 LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \ 60 $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) 61 61 INSTALL = @INSTALL@ 62 62 -
gsdl/trunk/runtime-src/src/recpt/Makefile.in
r18224 r18226 31 31 INDEXERS_DIR = $(COMMON_DIR)/indexers 32 32 COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages 33 PACKAGES_DIR = $(RUNTIME_DIR)/packages33 RUNTIME_PACKAGES_DIR = $(RUNTIME_DIR)/packages 34 34 COLSERVR_DIR = $(RUNTIME_DIR)/src/colservr 35 35 PROTOCOL_DIR = $(RUNTIME_DIR)/src/protocol … … 47 47 ifeq ($(USE_FASTCGI), 1) 48 48 FASTCGI_DEFS = -DUSE_FASTCGI 49 FASTCGI_INCLUDES = -I$( PACKAGES_DIR)/fcgi/include50 FASTCGI_LIBS = $( PACKAGES_DIR)/fcgi/libfcgi/libfcgi.a49 FASTCGI_INCLUDES = -I$(RUNTIME_PACKAGES_DIR)/fcgi/include 50 FASTCGI_LIBS = $(RUNTIME_PACKAGES_DIR)/fcgi/libfcgi/libfcgi.a 51 51 else 52 52 FASTCGI_DEFS = … … 66 66 Z3950_DEFS = -DUSE_Z3950 67 67 Z3950_INCLUDES = -I$(Z3950_DIR) 68 Z3950_LIBS = $(Z3950_DIR)/gsdlz3950.a $( PACKAGES_DIR)/yaz/lib/libyaz.a68 Z3950_LIBS = $(Z3950_DIR)/gsdlz3950.a $(RUNTIME_PACKAGES_DIR)/yaz/lib/libyaz.a 69 69 else 70 70 Z3950_DEFS = -
gsdl/trunk/runtime-src/src/z3950/Makefile.in
r18225 r18226 31 31 INDEXERS_DIR = $(COMMON_DIR)/indexers 32 32 COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages 33 PACKAGES_DIR = $(RUNTIME_DIR)/packages33 RUNTIME_PACKAGES_DIR = $(RUNTIME_DIR)/packages 34 34 COLSERVR_DIR = $(RUNTIME_DIR)/src/colservr 35 35 PROTOCOL_DIR = $(RUNTIME_DIR)/src/protocol … … 61 61 # Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist! 62 62 INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \ 63 -I$(INDEXERS_DIR)/mgpp/text -I$( PACKAGES_DIR)/yaz/yaz-2.1.4/include \64 -I$( PACKAGES_DIR)/yaz/yaz-2.1.4/client -I$(PACKAGES_DIR)/d2m63 -I$(INDEXERS_DIR)/mgpp/text -I$(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.4/include \ 64 -I$(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.4/client -I$(RUNTIME_PACKAGES_DIR)/d2m 65 65 INSTALL = @INSTALL@ 66 66 LDFLAGS = @LDFLAGS@ 67 67 LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \ 68 68 $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) \ 69 $( PACKAGES_DIR)/yaz/lib/libyaz.a $(PACKAGES_DIR)/d2m/libd2m.a -lxml269 $(RUNTIME_PACKAGES_DIR)/yaz/lib/libyaz.a $(RUNTIME_PACKAGES_DIR)/d2m/libd2m.a -lxml2 70 70 RANLIB = @RANLIB@ 71 71 … … 136 136 gsdlz3950.a: $(LIBRARY_OBJECTS) 137 137 rm -f $(LIBRARY) 138 $(AR) cru $(LIBRARY) $(LIBRARY_OBJECTS) $( PACKAGES_DIR)/yaz/yaz-2.1.4/client/tabcomplete.o138 $(AR) cru $(LIBRARY) $(LIBRARY_OBJECTS) $(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.4/client/tabcomplete.o 139 139 $(RANLIB) $(LIBRARY) 140 140
Note:
See TracChangeset
for help on using the changeset viewer.