Changeset 15569

Timestamp:

2008-05-19T13:23:45+12:00 (16 years ago)

Author:

mdewsnip

Message:

Some win32.mak fixes so that the Z39.50 stuff compiles successfully when USE_Z3950 = 1.

Location:

gsdl/trunk/src

Files:

• recpt/win32.mak (modified) (4 diffs)
• z3950/win32.mak (modified) (4 diffs)

gsdl/trunk/src/recpt/win32.mak

@@ -194 +194 @@
     wizardaction.obj
 
+LIBRARY = gsdlrecpt.lib
+
 GSDL_LIBS = \
     "$(PROTOCOL_DIR)\gsdlprotocol.lib" \
@@ -209 +211 @@
 EXECUTABLE = library.exe
 
-LIBRARY = gsdlrecpt.lib
-
-
+
+# Default target: make gsdlrecpt.lib if LOCAL_LIBRARY is set, otherwise both gsdlrecpt.lib and library.exe
 !IF $(LOCAL_LIBRARY)
 all: $(LIBRARY)
 !ELSE
-all: $(EXECUTABLE)
+all: $(LIBRARY) $(EXECUTABLE)
 !ENDIF
 
@@ -228 +229 @@
 
 !IF $(LOCAL_LIBRARY)
-install: $(LIBRARY)
+install:
 !ELSE
 install: $(EXECUTABLE)
@@ -236 +237 @@
 clean:
     del *.obj
+    del gsdlrecpt.lib
     del library.exe
 

gsdl/trunk/src/z3950/win32.mak

@@ -61 +61 @@
     -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\client" -I"$(PACKAGES_DIR)\d2m" \
     -I"$(PACKAGES_DIR)\windows\gdbm\gdbm"
+LDFLAGS = 
+LIBS = "$(PACKAGES_DIR)\windows\expat\expat\libexpat.lib" "$(PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" \
+        "$(PACKAGES_DIR)\d2m\libd2m.lib" "$(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib"
 
 !IF $(GSDL_VC4)
@@ -69 +72 @@
 
 COMPILE = $(CC) -nologo -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
+LINK = $(CC) -nologo -Fe"$@" $(LDFLAGS)
 
 
@@ -96 +100 @@
 
 LIBRARY = gsdlz3950.lib
-
-
-gsdlz3950.lib: $(LIBRARY_OBJECTS) 
-    if EXIST gsdlz3950.lib del gsdlz3950.lib
-    $(AR) -nologo /out:gsdlz3950.lib $(LIBRARY_OBJECTS) $(PACKAGES_DIR)/yaz/yaz-2.1.4/win/obj/tabcomplete.obj
 
 
@@ -132 +131 @@
 
 
-z3950server.exe: $(EXECUTABLE_OBJECTS)
-    $(CPPLINK) $(EXECUTABLE_OBJECTS) $(LIBS)
+# Default target: make both gsdlz3950.lib and z3950server.exe
+all: $(LIBRARY) $(EXECUTABLE)
 
 
-all: $(LIBRARY)
+gsdlz3950.lib: $(LIBRARY_OBJECTS)
+    if EXIST gsdlz3950.lib del gsdlz3950.lib
+    $(AR) -nologo /out:gsdlz3950.lib $(LIBRARY_OBJECTS) $(PACKAGES_DIR)/yaz/yaz-2.1.4/win/obj/tabcomplete.obj
 
-install: $(LIBRARY)
+z3950server.exe: $(EXECUTABLE_OBJECTS)
+    $(LINK) $(EXECUTABLE_OBJECTS) $(LIBS)
+
+
+install: $(EXECUTABLE)
+    copy z3950server.exe "$(GSDL_DIR)\cgi-bin"
 
 clean:
     del *.obj
     del gsdlz3950.lib
+    del z3950server.exe