Changeset 15546

Show
Ignore:
Timestamp:
16.05.2008 15:32:08 (12 years ago)
Author:
mdewsnip
Message:

Added a new "PACKAGE_DIRS" path value in the Makefiles to make paths a bit shorter.

Location:
gsdl/trunk
Files:
13 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/lib/Makefile.in

    r15508 r15546  
    2727GSDL_DIR = .. 
    2828INDEXERS_DIR = $(GSDL_DIR)/indexers 
     29PACKAGES_DIR = $(GSDL_DIR)/packages 
    2930 
    3031 
  • gsdl/trunk/lib/win32.mak

    r15537 r15546  
    2727GSDL_DIR = .. 
    2828INDEXERS_DIR = $(GSDL_DIR)\indexers 
     29PACKAGES_DIR = $(GSDL_DIR)\packages 
    2930 
    3031 
     
    3334DLL = 0 
    3435DLLDEBUG = 0 
    35 STLPATH = "$(GSDL_DIR)\packages\windows\stlport\stlport" 
     36STLPATH = "$(PACKAGES_DIR)\windows\stlport\stlport" 
    3637 
    3738 
     
    5556DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN \ 
    5657       -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE 
    57 INCLUDES = -I"$(GSDL_DIR)" -I"$(INDEXERS_DIR)\mg\lib" -I"$(GSDL_DIR)\packages\windows\gdbm\gdbm" 
     58INCLUDES = -I"$(GSDL_DIR)" -I"$(INDEXERS_DIR)\mg\lib" -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" 
    5859 
    5960!IF $(GSDL_VC4) 
  • gsdl/trunk/src/colservr/Makefile.in

    r15509 r15546  
    2727GSDL_DIR = ../.. 
    2828INDEXERS_DIR = $(GSDL_DIR)/indexers 
     29PACKAGES_DIR = $(GSDL_DIR)/packages 
    2930 
    3031 
     
    3940    -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mg/src/text \ 
    4041    -I$(INDEXERS_DIR)/mgpp/lib -I$(INDEXERS_DIR)/mgpp/text \ 
    41     -I$(GSDL_DIR)/packages/expat/include 
     42    -I$(PACKAGES_DIR)/expat/include 
    4243RANLIB = @RANLIB@ 
    4344 
  • gsdl/trunk/src/colservr/win32.mak

    r15523 r15546  
    2727GSDL_DIR = ..\.. 
    2828INDEXERS_DIR = $(GSDL_DIR)\indexers 
     29PACKAGES_DIR = $(GSDL_DIR)\packages 
    2930 
    3031 
     
    3233DLL = 0 
    3334DLLDEBUG = 0 
    34 STLPATH = "$(GSDL_DIR)\packages\windows\stlport\stlport" 
     35STLPATH = "$(PACKAGES_DIR)\windows\stlport\stlport" 
    3536 
    3637 
     
    5758    -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" \ 
    5859    -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" 
    6061 
    6162!IF $(GSDL_VC4) 
  • gsdl/trunk/src/oaiservr/Makefile.in

    r15489 r15546  
    2727GSDL_DIR = ../.. 
    2828INDEXERS_DIR = $(GSDL_DIR)/indexers 
     29PACKAGES_DIR = $(GSDL_DIR)/packages 
    2930COLSERVR_DIR = $(GSDL_DIR)/src/colservr 
    3031PROTOCOL_DIR = $(GSDL_DIR)/src/protocol 
     
    4445INCLUDES = -I$(GSDL_DIR)/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) -I$(INDEXERS_DIR)/mgpp/text 
    4546LDFLAGS = @LDFLAGS@ 
    46 LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(GSDL_DIR)/packages/expat/lib -lexpat $(ACCENTFOLD_LIBS) 
     47LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) 
    4748INSTALL = @INSTALL@ 
    4849 
  • gsdl/trunk/src/oaiservr/win32.mak

    r15539 r15546  
    2727GSDL_DIR = ..\.. 
    2828INDEXERS_DIR = $(GSDL_DIR)\indexers 
     29PACKAGES_DIR = $(GSDL_DIR)\packages 
    2930COLSERVR_DIR = $(GSDL_DIR)\src\colservr 
    3031PROTOCOL_DIR = $(GSDL_DIR)\src\protocol 
     
    3839ENABLE_ACCENTFOLD = 1 
    3940 
    40 STLPATH = "$(GSDL_DIR)\packages\windows\stlport\stlport" 
     41STLPATH = "$(PACKAGES_DIR)\windows\stlport\stlport" 
    4142 
    4243 
     
    6667DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE -DGSDL_NOCACHE 
    6768INCLUDES = -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" 
    7071LDFLAGS =  
    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) 
     72LIBS = "$(PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \ 
     73        "$(PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) 
    7374 
    7475!IF $(GSDL_VC4) 
  • gsdl/trunk/src/protocol/Makefile.in

    r15510 r15546  
    2727GSDL_DIR = ../.. 
    2828INDEXERS_DIR = $(GSDL_DIR)/indexers 
     29PACKAGES_DIR = $(GSDL_DIR)/packages 
    2930COLSERVR_DIR = $(GSDL_DIR)/src/colservr 
    3031 
  • gsdl/trunk/src/protocol/win32.mak

    r15525 r15546  
    2727GSDL_DIR = ..\.. 
    2828INDEXERS_DIR = $(GSDL_DIR)\indexers 
     29PACKAGES_DIR = $(GSDL_DIR)\packages 
    2930COLSERVR_DIR = $(GSDL_DIR)\src\colservr 
    3031 
     
    3334DLL = 0 
    3435DLLDEBUG = 0 
    35 STLPATH = "$(GSDL_DIR)\packages\windows\stlport\stlport" 
     36STLPATH = "$(PACKAGES_DIR)\windows\stlport\stlport" 
    3637 
    3738 
     
    5657# Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist! 
    5758INCLUDES = -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" 
    5960 
    6061!IF $(GSDL_VC4) 
  • gsdl/trunk/src/recpt/Makefile.in

    r15528 r15546  
    2727GSDL_DIR = ../.. 
    2828INDEXERS_DIR = $(GSDL_DIR)/indexers 
     29PACKAGES_DIR = $(GSDL_DIR)/packages 
    2930COLSERVR_DIR = $(GSDL_DIR)/src/colservr 
    3031PROTOCOL_DIR = $(GSDL_DIR)/src/protocol 
     
    4243ifeq ($(USE_FASTCGI), 1) 
    4344FASTCGI_DEFS = -DUSE_FASTCGI 
    44 FASTCGI_INCLUDES = -I$(GSDL_DIR)/packages/fcgi/include 
    45 FASTCGI_LIBS = $(GSDL_DIR)/packages/fcgi/libfcgi/libfcgi.a 
     45FASTCGI_INCLUDES = -I$(PACKAGES_DIR)/fcgi/include 
     46FASTCGI_LIBS = $(PACKAGES_DIR)/fcgi/libfcgi/libfcgi.a 
    4647else 
    4748FASTCGI_DEFS = 
     
    5455Z3950_DEFS = -DUSE_Z3950 
    5556Z3950_INCLUDES = -I$(Z3950_DIR) 
    56 Z3950_LIBS = $(Z3950_DIR)/gsdlz3950.a $(GSDL_DIR)/packages/yaz/lib/libyaz.a 
     57Z3950_LIBS = $(Z3950_DIR)/gsdlz3950.a $(PACKAGES_DIR)/yaz/lib/libyaz.a 
    5758else 
    5859Z3950_DEFS = 
     
    6768INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \ 
    6869    -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) 
    7071INSTALL = @INSTALL@ 
    7172LDFLAGS = @LDFLAGS@ 
    72 LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(GSDL_DIR)/packages/expat/lib -lexpat $(ACCENTFOLD_LIBS) \ 
     73LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) \ 
    7374    $(FASTCGI_LIBS) $(Z3950_LIBS) 
    7475 
  • gsdl/trunk/src/recpt/win32.mak

    r15545 r15546  
    2727GSDL_DIR = ..\.. 
    2828INDEXERS_DIR = $(GSDL_DIR)\indexers 
     29PACKAGES_DIR = $(GSDL_DIR)\packages 
    2930COLSERVR_DIR = $(GSDL_DIR)\src\colservr 
    3031PROTOCOL_DIR = $(GSDL_DIR)\src\protocol 
     
    3940ENABLE_ACCENTFOLD = 1 
    4041 
    41 STLPATH = "$(GSDL_DIR)\packages\windows\stlport\stlport" 
     42STLPATH = "$(PACKAGES_DIR)\windows\stlport\stlport" 
    4243 
    4344 
     
    6667Z3950_INCLUDES = -I$(Z3950_DIR) 
    6768Z3950_LDFLAGS = /link /NOD:msvcrt.lib 
    68 Z3950_LIBS = $(Z3950_DIR)\gsdlz3950.lib $(GSDL_DIR)\packages\yaz\yaz-2.1.4\lib\yaz.lib 
     69Z3950_LIBS = $(Z3950_DIR)\gsdlz3950.lib $(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib 
    6970!ELSE 
    7071Z3950_DEFS =  
     
    8081INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \ 
    8182    -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) 
    8485LDFLAGS = $(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) 
     86LIBS = "$(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) 
    8788 
    8889!IF $(GSDL_VC4) 
  • gsdl/trunk/src/w32server/win32.mak

    r15541 r15546  
    2727GSDL_DIR = ..\.. 
    2828INDEXERS_DIR = $(GSDL_DIR)\indexers 
     29PACKAGES_DIR = $(GSDL_DIR)\packages 
    2930COLSERVR_DIR = $(GSDL_DIR)\src\colservr 
    3031PROTOCOL_DIR = $(GSDL_DIR)\src\protocol 
     
    3334 
    3435GSDL_VC4 = 0 
    35 STLPATH = "$(GSDL_DIR)\packages\windows\stlport\stlport" 
     36STLPATH = "$(PACKAGES_DIR)\windows\stlport\stlport" 
    3637ENABLE_ACCENTFOLD = 1 
    3738 
     
    4445 
    4546!IF $(ENABLE_ACCENTFOLD) 
    46 ACCENTFOLD_LIBS = "$(GSDL_DIR)\indexers\packages\unac\libunac.lib" "$(GSDL_DIR)\indexers\packages\unac\iconv.lib" 
     47ACCENTFOLD_LIBS = "$(INDEXERS_DIR)\packages\unac\libunac.lib" "$(INDEXERS_DIR)\packages\unac\iconv.lib" 
    4748!ELSE 
    4849ACCENTFOLD_LIBS =  
     
    5556       -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE 
    5657INCLUDES = -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \ 
    57        -I"$(GSDL_DIR)\src\colservr" -I"$(GSDL_DIR)\indexers\mg" \ 
    58        -I"$(GSDL_DIR)\packages\windows\gdbm\gdbm" \ 
    59            -I"$(GSDL_DIR)\indexers\mg\lib" -I"$(GSDL_DIR)\indexers\mg\src\text" \ 
    60            -I"$(GSDL_DIR)\indexers\mgpp\lib" -I"$(GSDL_DIR)\indexers\mgpp\text" 
     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" 
    6162LDFLAGS = 
    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) 
     63LIBS = "$(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) 
    6465RSC = rc 
    6566WINLIBS = kernel32.lib user32.lib gdi32.lib winspool.lib \ 
  • gsdl/trunk/src/z3950/Makefile.in

    r15504 r15546  
    2727GSDL_DIR = ../.. 
    2828INDEXERS_DIR = $(GSDL_DIR)/indexers 
     29PACKAGES_DIR = $(GSDL_DIR)/packages 
    2930COLSERVR_DIR = $(GSDL_DIR)/src/colservr 
    3031PROTOCOL_DIR = $(GSDL_DIR)/src/protocol 
     
    4950# Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist! 
    5051INCLUDES = -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/d2m 
     52    -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 
    5354INSTALL = @INSTALL@ 
    5455LDFLAGS = @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 -lxml2 
     56LIBS = @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 
    5758RANLIB = @RANLIB@ 
    5859 
     
    9192gsdlz3950.a: $(LIBRARY_OBJECTS) 
    9293    rm -f gsdlz3950.a 
    93     $(AR) cru gsdlz3950.a $(LIBRARY_OBJECTS) $(GSDL_DIR)/packages/yaz/yaz-2.1.4/client/tabcomplete.o 
     94    $(AR) cru gsdlz3950.a $(LIBRARY_OBJECTS) $(PACKAGES_DIR)/yaz/yaz-2.1.4/client/tabcomplete.o 
    9495    $(RANLIB) gsdlz3950.a 
    9596 
  • gsdl/trunk/src/z3950/win32.mak

    r15544 r15546  
    2727GSDL_DIR = ..\.. 
    2828INDEXERS_DIR = $(GSDL_DIR)\indexers 
     29PACKAGES_DIR = $(GSDL_DIR)\packages 
    2930COLSERVR_DIR = $(GSDL_DIR)\src\colservr 
    3031PROTOCOL_DIR = $(GSDL_DIR)\src\protocol 
     
    3435DLL = 0 
    3536DLLDEBUG = 0 
    36 STLPATH = "$(GSDL_DIR)\packages\windows\stlport\stlport" 
     37STLPATH = "$(PACKAGES_DIR)\windows\stlport\stlport" 
    3738 
    3839 
     
    5758# Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist! 
    5859INCLUDES = -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" 
    6263 
    6364!IF $(GSDL_VC4) 
     
    99100gsdlz3950.lib: $(LIBRARY_OBJECTS)  
    100101    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.obj 
     102    $(AR) -nologo /out:gsdlz3950.lib $(LIBRARY_OBJECTS) $(PACKAGES_DIR)/yaz/yaz-2.1.4/win/obj/tabcomplete.obj 
    102103 
    103104all: $(LIBRARY)