Changeset 15546
- Timestamp:
- 2008-05-16T15:32:08+12:00 (16 years ago)
- Location:
- gsdl/trunk
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
gsdl/trunk/lib/Makefile.in
r15508 r15546 27 27 GSDL_DIR = .. 28 28 INDEXERS_DIR = $(GSDL_DIR)/indexers 29 PACKAGES_DIR = $(GSDL_DIR)/packages 29 30 30 31 -
gsdl/trunk/lib/win32.mak
r15537 r15546 27 27 GSDL_DIR = .. 28 28 INDEXERS_DIR = $(GSDL_DIR)\indexers 29 PACKAGES_DIR = $(GSDL_DIR)\packages 29 30 30 31 … … 33 34 DLL = 0 34 35 DLLDEBUG = 0 35 STLPATH = "$( GSDL_DIR)\packages\windows\stlport\stlport"36 STLPATH = "$(PACKAGES_DIR)\windows\stlport\stlport" 36 37 37 38 … … 55 56 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN \ 56 57 -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE 57 INCLUDES = -I"$(GSDL_DIR)" -I"$(INDEXERS_DIR)\mg\lib" -I"$( GSDL_DIR)\packages\windows\gdbm\gdbm"58 INCLUDES = -I"$(GSDL_DIR)" -I"$(INDEXERS_DIR)\mg\lib" -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" 58 59 59 60 !IF $(GSDL_VC4) -
gsdl/trunk/src/colservr/Makefile.in
r15509 r15546 27 27 GSDL_DIR = ../.. 28 28 INDEXERS_DIR = $(GSDL_DIR)/indexers 29 PACKAGES_DIR = $(GSDL_DIR)/packages 29 30 30 31 … … 39 40 -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mg/src/text \ 40 41 -I$(INDEXERS_DIR)/mgpp/lib -I$(INDEXERS_DIR)/mgpp/text \ 41 -I$( GSDL_DIR)/packages/expat/include42 -I$(PACKAGES_DIR)/expat/include 42 43 RANLIB = @RANLIB@ 43 44 -
gsdl/trunk/src/colservr/win32.mak
r15523 r15546 27 27 GSDL_DIR = ..\.. 28 28 INDEXERS_DIR = $(GSDL_DIR)\indexers 29 PACKAGES_DIR = $(GSDL_DIR)\packages 29 30 30 31 … … 32 33 DLL = 0 33 34 DLLDEBUG = 0 34 STLPATH = "$( GSDL_DIR)\packages\windows\stlport\stlport"35 STLPATH = "$(PACKAGES_DIR)\windows\stlport\stlport" 35 36 36 37 … … 57 58 -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" \ 58 59 -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text" \ 59 -I"$( GSDL_DIR)\packages\windows\expat\expat" -I"$(GSDL_DIR)\packages\windows\gdbm\gdbm"60 -I"$(PACKAGES_DIR)\windows\expat\expat" -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" 60 61 61 62 !IF $(GSDL_VC4) -
gsdl/trunk/src/oaiservr/Makefile.in
r15489 r15546 27 27 GSDL_DIR = ../.. 28 28 INDEXERS_DIR = $(GSDL_DIR)/indexers 29 PACKAGES_DIR = $(GSDL_DIR)/packages 29 30 COLSERVR_DIR = $(GSDL_DIR)/src/colservr 30 31 PROTOCOL_DIR = $(GSDL_DIR)/src/protocol … … 44 45 INCLUDES = -I$(GSDL_DIR)/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) -I$(INDEXERS_DIR)/mgpp/text 45 46 LDFLAGS = @LDFLAGS@ 46 LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$( GSDL_DIR)/packages/expat/lib -lexpat $(ACCENTFOLD_LIBS)47 LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) 47 48 INSTALL = @INSTALL@ 48 49 -
gsdl/trunk/src/oaiservr/win32.mak
r15539 r15546 27 27 GSDL_DIR = ..\.. 28 28 INDEXERS_DIR = $(GSDL_DIR)\indexers 29 PACKAGES_DIR = $(GSDL_DIR)\packages 29 30 COLSERVR_DIR = $(GSDL_DIR)\src\colservr 30 31 PROTOCOL_DIR = $(GSDL_DIR)\src\protocol … … 38 39 ENABLE_ACCENTFOLD = 1 39 40 40 STLPATH = "$( GSDL_DIR)\packages\windows\stlport\stlport"41 STLPATH = "$(PACKAGES_DIR)\windows\stlport\stlport" 41 42 42 43 … … 66 67 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE -DGSDL_NOCACHE 67 68 INCLUDES = -I"$(GSDL_DIR)\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \ 68 -I"$(INDEXERS_DIR)\mgpp\text" -I"$( GSDL_DIR)\packages\windows\crypt\crypt" \69 -I"$( GSDL_DIR)\packages\windows\expat\expat" -I"$(GSDL_DIR)\packages\windows\gdbm\gdbm"69 -I"$(INDEXERS_DIR)\mgpp\text" -I"$(PACKAGES_DIR)\windows\crypt\crypt" \ 70 -I"$(PACKAGES_DIR)\windows\expat\expat" -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" 70 71 LDFLAGS = 71 LIBS = "$( GSDL_DIR)\packages\windows\crypt\crypt\crypt.lib" "$(GSDL_DIR)\packages\windows\expat\expat\libexpat.lib" \72 "$( GSDL_DIR)\packages\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS)72 LIBS = "$(PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \ 73 "$(PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) 73 74 74 75 !IF $(GSDL_VC4) -
gsdl/trunk/src/protocol/Makefile.in
r15510 r15546 27 27 GSDL_DIR = ../.. 28 28 INDEXERS_DIR = $(GSDL_DIR)/indexers 29 PACKAGES_DIR = $(GSDL_DIR)/packages 29 30 COLSERVR_DIR = $(GSDL_DIR)/src/colservr 30 31 -
gsdl/trunk/src/protocol/win32.mak
r15525 r15546 27 27 GSDL_DIR = ..\.. 28 28 INDEXERS_DIR = $(GSDL_DIR)\indexers 29 PACKAGES_DIR = $(GSDL_DIR)\packages 29 30 COLSERVR_DIR = $(GSDL_DIR)\src\colservr 30 31 … … 33 34 DLL = 0 34 35 DLLDEBUG = 0 35 STLPATH = "$( GSDL_DIR)\packages\windows\stlport\stlport"36 STLPATH = "$(PACKAGES_DIR)\windows\stlport\stlport" 36 37 37 38 … … 56 57 # Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist! 57 58 INCLUDES = -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\lib" -I"$(COLSERVR_DIR)" -I"$(INDEXERS_DIR)\mgpp\text" \ 58 -I"$( GSDL_DIR)\packages\windows\gdbm\gdbm"59 -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" 59 60 60 61 !IF $(GSDL_VC4) -
gsdl/trunk/src/recpt/Makefile.in
r15528 r15546 27 27 GSDL_DIR = ../.. 28 28 INDEXERS_DIR = $(GSDL_DIR)/indexers 29 PACKAGES_DIR = $(GSDL_DIR)/packages 29 30 COLSERVR_DIR = $(GSDL_DIR)/src/colservr 30 31 PROTOCOL_DIR = $(GSDL_DIR)/src/protocol … … 42 43 ifeq ($(USE_FASTCGI), 1) 43 44 FASTCGI_DEFS = -DUSE_FASTCGI 44 FASTCGI_INCLUDES = -I$( GSDL_DIR)/packages/fcgi/include45 FASTCGI_LIBS = $( GSDL_DIR)/packages/fcgi/libfcgi/libfcgi.a45 FASTCGI_INCLUDES = -I$(PACKAGES_DIR)/fcgi/include 46 FASTCGI_LIBS = $(PACKAGES_DIR)/fcgi/libfcgi/libfcgi.a 46 47 else 47 48 FASTCGI_DEFS = … … 54 55 Z3950_DEFS = -DUSE_Z3950 55 56 Z3950_INCLUDES = -I$(Z3950_DIR) 56 Z3950_LIBS = $(Z3950_DIR)/gsdlz3950.a $( GSDL_DIR)/packages/yaz/lib/libyaz.a57 Z3950_LIBS = $(Z3950_DIR)/gsdlz3950.a $(PACKAGES_DIR)/yaz/lib/libyaz.a 57 58 else 58 59 Z3950_DEFS = … … 67 68 INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \ 68 69 -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mgpp/text \ 69 -I$( GSDL_DIR)/packages/expat/include $(FASTCGI_INCLUDES) $(Z3950_INCLUDES)70 -I$(PACKAGES_DIR)/expat/include $(FASTCGI_INCLUDES) $(Z3950_INCLUDES) 70 71 INSTALL = @INSTALL@ 71 72 LDFLAGS = @LDFLAGS@ 72 LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$( GSDL_DIR)/packages/expat/lib -lexpat $(ACCENTFOLD_LIBS) \73 LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) \ 73 74 $(FASTCGI_LIBS) $(Z3950_LIBS) 74 75 -
gsdl/trunk/src/recpt/win32.mak
r15545 r15546 27 27 GSDL_DIR = ..\.. 28 28 INDEXERS_DIR = $(GSDL_DIR)\indexers 29 PACKAGES_DIR = $(GSDL_DIR)\packages 29 30 COLSERVR_DIR = $(GSDL_DIR)\src\colservr 30 31 PROTOCOL_DIR = $(GSDL_DIR)\src\protocol … … 39 40 ENABLE_ACCENTFOLD = 1 40 41 41 STLPATH = "$( GSDL_DIR)\packages\windows\stlport\stlport"42 STLPATH = "$(PACKAGES_DIR)\windows\stlport\stlport" 42 43 43 44 … … 66 67 Z3950_INCLUDES = -I$(Z3950_DIR) 67 68 Z3950_LDFLAGS = /link /NOD:msvcrt.lib 68 Z3950_LIBS = $(Z3950_DIR)\gsdlz3950.lib $( GSDL_DIR)\packages\yaz\yaz-2.1.4\lib\yaz.lib69 Z3950_LIBS = $(Z3950_DIR)\gsdlz3950.lib $(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib 69 70 !ELSE 70 71 Z3950_DEFS = … … 80 81 INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \ 81 82 -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mgpp\text" \ 82 -I"$( GSDL_DIR)\packages\windows\crypt\crypt" -I"$(GSDL_DIR)\packages\windows\expat\expat" \83 -I"$( GSDL_DIR)\packages\windows\gdbm\gdbm" $(Z3950_INCLUDES)83 -I"$(PACKAGES_DIR)\windows\crypt\crypt" -I"$(PACKAGES_DIR)\windows\expat\expat" \ 84 -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" $(Z3950_INCLUDES) 84 85 LDFLAGS = $(Z3950_LDFLAGS) 85 LIBS = "$( GSDL_DIR)\packages\windows\crypt\crypt\crypt.lib" "$(GSDL_DIR)\packages\windows\expat\expat\libexpat.lib" \86 "$( GSDL_DIR)\packages\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(Z3950_LIBS)86 LIBS = "$(PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \ 87 "$(PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(Z3950_LIBS) 87 88 88 89 !IF $(GSDL_VC4) -
gsdl/trunk/src/w32server/win32.mak
r15541 r15546 27 27 GSDL_DIR = ..\.. 28 28 INDEXERS_DIR = $(GSDL_DIR)\indexers 29 PACKAGES_DIR = $(GSDL_DIR)\packages 29 30 COLSERVR_DIR = $(GSDL_DIR)\src\colservr 30 31 PROTOCOL_DIR = $(GSDL_DIR)\src\protocol … … 33 34 34 35 GSDL_VC4 = 0 35 STLPATH = "$( GSDL_DIR)\packages\windows\stlport\stlport"36 STLPATH = "$(PACKAGES_DIR)\windows\stlport\stlport" 36 37 ENABLE_ACCENTFOLD = 1 37 38 … … 44 45 45 46 !IF $(ENABLE_ACCENTFOLD) 46 ACCENTFOLD_LIBS = "$( GSDL_DIR)\indexers\packages\unac\libunac.lib" "$(GSDL_DIR)\indexers\packages\unac\iconv.lib"47 ACCENTFOLD_LIBS = "$(INDEXERS_DIR)\packages\unac\libunac.lib" "$(INDEXERS_DIR)\packages\unac\iconv.lib" 47 48 !ELSE 48 49 ACCENTFOLD_LIBS = … … 55 56 -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE 56 57 INCLUDES = -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \ 57 58 -I"$(GSDL_DIR)\packages\windows\gdbm\gdbm" \59 60 58 -I"$(GSDL_DIR)\src\colservr" -I"$(GSDL_DIR)\indexers\mg" \ 59 -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" \ 60 -I"$(GSDL_DIR)\indexers\mg\lib" -I"$(GSDL_DIR)\indexers\mg\src\text" \ 61 -I"$(GSDL_DIR)\indexers\mgpp\lib" -I"$(GSDL_DIR)\indexers\mgpp\text" 61 62 LDFLAGS = 62 LIBS = "$( GSDL_DIR)\packages\windows\crypt\crypt\crypt.lib" "$(GSDL_DIR)\packages\windows\expat\expat\libexpat.lib" \63 "$( GSDL_DIR)\packages\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(Z3950_LIBS)63 LIBS = "$(PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \ 64 "$(PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(Z3950_LIBS) 64 65 RSC = rc 65 66 WINLIBS = kernel32.lib user32.lib gdi32.lib winspool.lib \ -
gsdl/trunk/src/z3950/Makefile.in
r15504 r15546 27 27 GSDL_DIR = ../.. 28 28 INDEXERS_DIR = $(GSDL_DIR)/indexers 29 PACKAGES_DIR = $(GSDL_DIR)/packages 29 30 COLSERVR_DIR = $(GSDL_DIR)/src/colservr 30 31 PROTOCOL_DIR = $(GSDL_DIR)/src/protocol … … 49 50 # Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist! 50 51 INCLUDES = -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \ 51 -I$(INDEXERS_DIR)/mgpp/text -I$( GSDL_DIR)/packages/yaz/yaz-2.1.4/include \52 -I$( GSDL_DIR)/packages/yaz/yaz-2.1.4/client -I$(GSDL_DIR)/packages/d2m52 -I$(INDEXERS_DIR)/mgpp/text -I$(PACKAGES_DIR)/yaz/yaz-2.1.4/include \ 53 -I$(PACKAGES_DIR)/yaz/yaz-2.1.4/client -I$(PACKAGES_DIR)/d2m 53 54 INSTALL = @INSTALL@ 54 55 LDFLAGS = @LDFLAGS@ 55 LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$( GSDL_DIR)/packages/expat/lib -lexpat $(ACCENTFOLD_LIBS) \56 $( GSDL_DIR)/packages/yaz/lib/libyaz.a $(GSDL_DIR)/packages/d2m/libd2m.a -lxml256 LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) \ 57 $(PACKAGES_DIR)/yaz/lib/libyaz.a $(PACKAGES_DIR)/d2m/libd2m.a -lxml2 57 58 RANLIB = @RANLIB@ 58 59 … … 91 92 gsdlz3950.a: $(LIBRARY_OBJECTS) 92 93 rm -f gsdlz3950.a 93 $(AR) cru gsdlz3950.a $(LIBRARY_OBJECTS) $( GSDL_DIR)/packages/yaz/yaz-2.1.4/client/tabcomplete.o94 $(AR) cru gsdlz3950.a $(LIBRARY_OBJECTS) $(PACKAGES_DIR)/yaz/yaz-2.1.4/client/tabcomplete.o 94 95 $(RANLIB) gsdlz3950.a 95 96 -
gsdl/trunk/src/z3950/win32.mak
r15544 r15546 27 27 GSDL_DIR = ..\.. 28 28 INDEXERS_DIR = $(GSDL_DIR)\indexers 29 PACKAGES_DIR = $(GSDL_DIR)\packages 29 30 COLSERVR_DIR = $(GSDL_DIR)\src\colservr 30 31 PROTOCOL_DIR = $(GSDL_DIR)\src\protocol … … 34 35 DLL = 0 35 36 DLLDEBUG = 0 36 STLPATH = "$( GSDL_DIR)\packages\windows\stlport\stlport"37 STLPATH = "$(PACKAGES_DIR)\windows\stlport\stlport" 37 38 38 39 … … 57 58 # Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist! 58 59 INCLUDES = -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \ 59 -I"$(INDEXERS_DIR)\mgpp\text" -I"$( GSDL_DIR)\packages\yaz\yaz-2.1.4\include" \60 -I"$( GSDL_DIR)\packages\yaz\yaz-2.1.4\client" -I"$(GSDL_DIR)\packages\d2m" \61 -I"$( GSDL_DIR)\packages\windows\gdbm\gdbm"60 -I"$(INDEXERS_DIR)\mgpp\text" -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\include" \ 61 -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\client" -I"$(PACKAGES_DIR)\d2m" \ 62 -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" 62 63 63 64 !IF $(GSDL_VC4) … … 99 100 gsdlz3950.lib: $(LIBRARY_OBJECTS) 100 101 if EXIST gsdlz3950.lib del gsdlz3950.lib 101 $(AR) -nologo /out:gsdlz3950.lib $(LIBRARY_OBJECTS) $( GSDL_DIR)/packages/yaz/yaz-2.1.4/win/obj/tabcomplete.obj102 $(AR) -nologo /out:gsdlz3950.lib $(LIBRARY_OBJECTS) $(PACKAGES_DIR)/yaz/yaz-2.1.4/win/obj/tabcomplete.obj 102 103 103 104 all: $(LIBRARY)
Note:
See TracChangeset
for help on using the changeset viewer.