Changeset 15546 for gsdl/trunk/src/z3950

Timestamp:

2008-05-16T15:32:08+12:00 (16 years ago)

Author:

mdewsnip

Message:

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

Location:

gsdl/trunk/src/z3950

Files:

• Makefile.in (modified) (3 diffs)
• win32.mak (modified) (4 diffs)

gsdl/trunk/src/z3950/Makefile.in

@@ -27 +27 @@
 GSDL_DIR = ../..
 INDEXERS_DIR = $(GSDL_DIR)/indexers
+PACKAGES_DIR = $(GSDL_DIR)/packages
 COLSERVR_DIR = $(GSDL_DIR)/src/colservr
 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!
 INCLUDES = -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \
-    -I$(INDEXERS_DIR)/mgpp/text -I$(GSDL_DIR)/packages/yaz/yaz-2.1.4/include \
-    -I$(GSDL_DIR)/packages/yaz/yaz-2.1.4/client -I$(GSDL_DIR)/packages/d2m
+    -I$(INDEXERS_DIR)/mgpp/text -I$(PACKAGES_DIR)/yaz/yaz-2.1.4/include \
+    -I$(PACKAGES_DIR)/yaz/yaz-2.1.4/client -I$(PACKAGES_DIR)/d2m
 INSTALL = @INSTALL@
 LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(GSDL_DIR)/packages/expat/lib -lexpat $(ACCENTFOLD_LIBS) \
-    $(GSDL_DIR)/packages/yaz/lib/libyaz.a $(GSDL_DIR)/packages/d2m/libd2m.a -lxml2
+LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) \
+    $(PACKAGES_DIR)/yaz/lib/libyaz.a $(PACKAGES_DIR)/d2m/libd2m.a -lxml2
 RANLIB = @RANLIB@
 
@@ -91 +92 @@
 gsdlz3950.a: $(LIBRARY_OBJECTS)
     rm -f gsdlz3950.a
-    $(AR) cru gsdlz3950.a $(LIBRARY_OBJECTS) $(GSDL_DIR)/packages/yaz/yaz-2.1.4/client/tabcomplete.o
+    $(AR) cru gsdlz3950.a $(LIBRARY_OBJECTS) $(PACKAGES_DIR)/yaz/yaz-2.1.4/client/tabcomplete.o
     $(RANLIB) gsdlz3950.a
 

gsdl/trunk/src/z3950/win32.mak

@@ -27 +27 @@
 GSDL_DIR = ..\..
 INDEXERS_DIR = $(GSDL_DIR)\indexers
+PACKAGES_DIR = $(GSDL_DIR)\packages
 COLSERVR_DIR = $(GSDL_DIR)\src\colservr
 PROTOCOL_DIR = $(GSDL_DIR)\src\protocol
@@ -34 +35 @@
 DLL = 0
 DLLDEBUG = 0
-STLPATH = "$(GSDL_DIR)\packages\windows\stlport\stlport"
+STLPATH = "$(PACKAGES_DIR)\windows\stlport\stlport"
 
 
@@ -57 +58 @@
 # Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist!
 INCLUDES = -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
-    -I"$(INDEXERS_DIR)\mgpp\text" -I"$(GSDL_DIR)\packages\yaz\yaz-2.1.4\include" \
-    -I"$(GSDL_DIR)\packages\yaz\yaz-2.1.4\client" -I"$(GSDL_DIR)\packages\d2m" \
-    -I"$(GSDL_DIR)\packages\windows\gdbm\gdbm"
+    -I"$(INDEXERS_DIR)\mgpp\text" -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\include" \
+    -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\client" -I"$(PACKAGES_DIR)\d2m" \
+    -I"$(PACKAGES_DIR)\windows\gdbm\gdbm"
 
 !IF $(GSDL_VC4)
@@ -99 +100 @@
 gsdlz3950.lib: $(LIBRARY_OBJECTS) 
     if EXIST gsdlz3950.lib del gsdlz3950.lib
-    $(AR) -nologo /out:gsdlz3950.lib $(LIBRARY_OBJECTS) $(GSDL_DIR)/packages/yaz/yaz-2.1.4/win/obj/tabcomplete.obj
+    $(AR) -nologo /out:gsdlz3950.lib $(LIBRARY_OBJECTS) $(PACKAGES_DIR)/yaz/yaz-2.1.4/win/obj/tabcomplete.obj
 
 all: $(LIBRARY)