Changeset 15569

Show
Ignore:
Timestamp:
19.05.2008 13:23:45 (11 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:
2 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/src/recpt/win32.mak

    r15568 r15569  
    194194    wizardaction.obj 
    195195 
     196LIBRARY = gsdlrecpt.lib 
     197 
    196198GSDL_LIBS = \ 
    197199    "$(PROTOCOL_DIR)\gsdlprotocol.lib" \ 
     
    209211EXECUTABLE = library.exe 
    210212 
    211 LIBRARY = gsdlrecpt.lib 
    212  
    213  
     213 
     214# Default target: make gsdlrecpt.lib if LOCAL_LIBRARY is set, otherwise both gsdlrecpt.lib and library.exe 
    214215!IF $(LOCAL_LIBRARY) 
    215216all: $(LIBRARY) 
    216217!ELSE 
    217 all: $(EXECUTABLE) 
     218all: $(LIBRARY) $(EXECUTABLE) 
    218219!ENDIF 
    219220 
     
    228229 
    229230!IF $(LOCAL_LIBRARY) 
    230 install: $(LIBRARY) 
     231install: 
    231232!ELSE 
    232233install: $(EXECUTABLE) 
     
    236237clean: 
    237238    del *.obj 
     239    del gsdlrecpt.lib 
    238240    del library.exe 
    239241 
  • gsdl/trunk/src/z3950/win32.mak

    r15547 r15569  
    6161    -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\client" -I"$(PACKAGES_DIR)\d2m" \ 
    6262    -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" 
     63LDFLAGS =  
     64LIBS = "$(PACKAGES_DIR)\windows\expat\expat\libexpat.lib" "$(PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" \ 
     65        "$(PACKAGES_DIR)\d2m\libd2m.lib" "$(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib" 
    6366 
    6467!IF $(GSDL_VC4) 
     
    6972 
    7073COMPILE = $(CC) -nologo -c $(CPPFLAGS) $(DEFS) $(INCLUDES) 
     74LINK = $(CC) -nologo -Fe"$@" $(LDFLAGS) 
    7175 
    7276 
     
    96100 
    97101LIBRARY = gsdlz3950.lib 
    98  
    99  
    100 gsdlz3950.lib: $(LIBRARY_OBJECTS)  
    101     if EXIST gsdlz3950.lib del gsdlz3950.lib 
    102     $(AR) -nologo /out:gsdlz3950.lib $(LIBRARY_OBJECTS) $(PACKAGES_DIR)/yaz/yaz-2.1.4/win/obj/tabcomplete.obj 
    103102 
    104103 
     
    132131 
    133132 
    134 z3950server.exe: $(EXECUTABLE_OBJECTS) 
    135     $(CPPLINK) $(EXECUTABLE_OBJECTS) $(LIBS) 
     133# Default target: make both gsdlz3950.lib and z3950server.exe 
     134all: $(LIBRARY) $(EXECUTABLE) 
    136135 
    137136 
    138 all: $(LIBRARY) 
     137gsdlz3950.lib: $(LIBRARY_OBJECTS) 
     138    if EXIST gsdlz3950.lib del gsdlz3950.lib 
     139    $(AR) -nologo /out:gsdlz3950.lib $(LIBRARY_OBJECTS) $(PACKAGES_DIR)/yaz/yaz-2.1.4/win/obj/tabcomplete.obj 
    139140 
    140 install: $(LIBRARY) 
     141z3950server.exe: $(EXECUTABLE_OBJECTS) 
     142    $(LINK) $(EXECUTABLE_OBJECTS) $(LIBS) 
     143 
     144 
     145install: $(EXECUTABLE) 
     146    copy z3950server.exe "$(GSDL_DIR)\cgi-bin" 
    141147 
    142148clean: 
    143149    del *.obj 
    144150    del gsdlz3950.lib 
     151    del z3950server.exe