Changeset 11554 for trunk

Timestamp:

2006-04-02T16:52:33+12:00 (18 years ago)

Author:

kjdon

Message:

added support for USE_Z3950. This now gets passed down, and d2m and yaz get compiled.

File:

• trunk/gsdl/win32.mak (modified) (4 diffs)

trunk/gsdl/win32.mak

@@ -30 +30 @@
 DLL = 0
 DLLDEBUG = 0
+USE_Z3950 = 0
 
 MDEFINES = /f win32.mak
@@ -38 +39 @@
 INSTALLDIRS = packages\mg\src\text src\mgpp\text src\recpt src\oaiservr \
           src\hashfile src\db2txt src\txt2db
+
+YAZ_DIR = packages\yaz\yaz-2.1.4\win
 
 MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)"
@@ -53 +56 @@
 MAKECMD = $(MAKECMD) DLLDEBUG=1
 !ENDIF
+!IF $(USE_Z3950)
+MAKECMD = $(MAKECMD) USE_Z3950=1
+OTHERDIRS = packages\d2m $(OTHERDIRS) 
+YAZ_DIRS = $(YAZ_DIR)
+!ENDIF
 
 MAKECLEANCMD = $(MAKE) $(MDEFINES) clean
 
-all: win32.mak $(OTHERDIRS) $(INSTALLDIRS)
+all: win32.mak $(OTHERDIRS) $(YAZ_DIRS) $(INSTALLDIRS) 
 
 install: win32.mak $(INSTALLDIRS)
@@ -109 +117 @@
     cd "$(GSDLHOME)"
 
+$(YAZ_DIR): FORCE
+    cd "$@"
+    nmake HAVE_ICONV=0 HAVE_LIBXML2=0
+    cd "$(GSDLHOME)"
+
 FORCE:
+