Changeset 15580


Ignore:
Timestamp:
2008-05-19T16:04:47+12:00 (16 years ago)
Author:
mdewsnip
Message:

Hopefully the last of the makefile tidy ups.

Location:
gsdl/trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • gsdl/trunk/lib/Makefile.in

    r15579 r15580  
    9494    $(RANLIB) $(LIBRARY)
    9595
    96 install: $(LIBRARY)
     96install:
    9797
    9898clean:

  • gsdl/trunk/lib/win32.mak

    r15546 r15580  
    115115
    116116
    117 gsdllib.lib : $(OBJECTS)
    118     if EXIST gsdllib.lib del gsdllib.lib
    119     $(AR) -nologo /out:gsdllib.lib $(OBJECTS)
    120 
     117# Default target: make gsdllib.lib
    121118all: $(LIBRARY)
    122119
    123 install: $(LIBRARY)
     120gsdllib.lib : $(OBJECTS)
     121    if EXIST $(LIBRARY) del $(LIBRARY)
     122    $(AR) -nologo /out:$(LIBRARY) $(OBJECTS)
     123
     124install:
    124125
    125126clean:
    126127    del *.obj
    127     del gsdllib.lib
     128    del $(LIBRARY)
    128129
    129130

  • gsdl/trunk/src/colservr/Makefile.in

    r15579 r15580  
    125125    $(RANLIB) $(LIBRARY)
    126126
    127 install: $(LIBRARY)
     127install:
    128128
    129129clean:

  • gsdl/trunk/src/colservr/win32.mak

    r15546 r15580  
    138138
    139139
    140 gsdlcolservr.lib: $(OBJECTS)
    141     if EXIST gsdlcolservr.lib del gsdlcolservr.lib
    142     $(AR) -nologo /out:gsdlcolservr.lib $(OBJECTS)
    143 
     140# Default target: make gsdlcolservr.lib
    144141all: $(LIBRARY)
    145142
    146 install: $(LIBRARY)
     143gsdlcolservr.lib: $(OBJECTS)
     144    if EXIST $(LIBRARY) del $(LIBRARY)
     145    $(AR) -nologo /out:$(LIBRARY) $(OBJECTS)
     146
     147install:
    147148
    148149clean:
    149150    del *.obj
    150     del gsdlcolservr.lib
     151    del $(LIBRARY)

  • gsdl/trunk/src/oaiservr/win32.mak

    r15574 r15580  
    152152
    153153
     154# Default target: make the oaiserver executable
     155all: $(EXECUTABLE)
     156
    154157oaiserver.exe: $(EXECUTABLE_OBJECTS)
    155158    $(LINK) $(EXECUTABLE_OBJECTS) $(LIBS)
    156159
    157 all: $(EXECUTABLE)
    158 
    159160install: $(EXECUTABLE)
    160     copy oaiserver.exe "$(GSDL_DIR)\cgi-bin"
     161    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin"
    161162
    162163clean:
    163164    del *.obj
    164     del oaiserver.exe
     165    del $(EXECUTABLE)

  • gsdl/trunk/src/protocol/Makefile.in

    r15579 r15580  
    7070    $(RANLIB) $(LIBRARY)
    7171
    72 install: $(LIBRARY)
     72install:
    7373
    7474clean:

  • gsdl/trunk/src/protocol/win32.mak

    r15572 r15580  
    8787   
    8888
    89 gsdlprotocol.lib: $(OBJECTS)
    90     if EXIST gsdlprotocol.lib del gsdlprotocol.lib
    91     $(AR) -nologo /out:gsdlprotocol.lib $(OBJECTS)
    92 
     89# Default target: make gsdlprotocol.lib
    9390all: $(LIBRARY)
    9491
    95 install: $(LIBRARY)
     92gsdlprotocol.lib: $(OBJECTS)
     93    if EXIST $(LIBRARY) del $(LIBRARY)
     94    $(AR) -nologo /out:$(LIBRARY) $(OBJECTS)
     95
     96install:
    9697
    9798clean:
    9899    del *.obj
    99     del gsdlprotocol.lib
     100    del $(LIBRARY)

  • gsdl/trunk/src/recpt/win32.mak

    r15572 r15580  
    217217!ENDIF
    218218
     219gsdlrecpt.lib: $(OBJECTS)
     220    if EXIST $(LIBRARY) del $(LIBRARY)
     221    $(AR) -nologo /out:$(LIBRARY) $(OBJECTS)
    219222
    220223library.exe: $(EXECUTABLE_OBJECTS)
    221224    $(LINK) $(EXECUTABLE_OBJECTS) $(LIBS)
    222225
    223 gsdlrecpt.lib: $(OBJECTS)
    224     if EXIST gsdlrecpt.lib del gsdlrecpt.lib
    225     $(AR) -nologo /out:gsdlrecpt.lib $(OBJECTS)
    226 
    227 
    228226!IF $(LOCAL_LIBRARY)
    229227install:
    230228!ELSE
    231229install: $(EXECUTABLE)
    232     copy library.exe "$(GSDL_DIR)\cgi-bin"
     230    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin"
    233231!ENDIF
    234232
    235233clean:
    236234    del *.obj
    237     del gsdlrecpt.lib
    238     del library.exe
     235    del $(LIBRARY)
     236    del $(EXECUTABLE)
    239237
    240238

  • gsdl/trunk/src/w32server/win32.mak

    r15546 r15580  
    133133
    134134
     135# Default target: make the local library executable
     136all: $(EXECUTABLE)
     137
    135138server.exe: $(EXECUTABLE_OBJECTS)
    136139    $(LINK) $(EXECUTABLE_OBJECTS) $(LIBS) $(WINLIBS)
    137 
    138 all: $(EXECUTABLE)
    139 
    140140install:
    141141    copy $(EXECUTABLE) "$(GSDL_DIR)"

  • gsdl/trunk/src/z3950/win32.mak

    r15571 r15580  
    134134all: $(LIBRARY) $(EXECUTABLE)
    135135
    136 
    137136gsdlz3950.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
     137    if EXIST $(LIBRARY) del $(LIBRARY)
     138    $(AR) -nologo /out:$(LIBRARY) $(LIBRARY_OBJECTS) $(PACKAGES_DIR)/yaz/yaz-2.1.4/win/obj/tabcomplete.obj
    140139
    141140z3950server.exe: $(EXECUTABLE_OBJECTS)
    142141    $(LINK) $(EXECUTABLE_OBJECTS) $(LIBS)
    143142
    144 
    145143install: $(EXECUTABLE)
    146     copy z3950server.exe "$(GSDL_DIR)\bin\windows"
     144    copy $(EXECUTABLE) "$(GSDL_DIR)\bin\windows"
    147145
    148146clean:
    149147    del *.obj
    150     del gsdlz3950.lib
    151     del z3950server.exe
     148    del $(LIBRARY)
     149    del $(EXECUTABLE)
Note: See TracChangeset for help on using the changeset viewer.