Changeset 15579


Ignore:
Timestamp:
2008-05-19T15:54:46+12:00 (16 years ago)
Author:
mdewsnip
Message:

More tidy ups to all the Makefiles, this time to tidy up the targets and add comments about the default target.

Location:
gsdl/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • gsdl/trunk/lib/Makefile.in

    r15552 r15579  
    8686
    8787
     88# Default target: make gsdllib.a
     89all: $(LIBRARY)
     90
    8891gsdllib.a: $(OBJECTS)
    89     rm -f gsdllib.a
    90     $(AR) cru gsdllib.a $(OBJECTS)
    91     $(RANLIB) gsdllib.a
    92 
    93 all: $(LIBRARY)
     92    rm -f $(LIBRARY)
     93    $(AR) cru $(LIBRARY) $(OBJECTS)
     94    $(RANLIB) $(LIBRARY)
    9495
    9596install: $(LIBRARY)
    9697
    9798clean:
    98     rm -f $(OBJECTS) gsdllib.a
     99    rm -f $(OBJECTS) $(LIBRARY)
    99100
    100101distclean:
    101     rm -f $(OBJECTS) gsdllib.a Makefile
     102    rm -f $(OBJECTS) $(LIBRARY) Makefile
    102103
    103104depend:

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

    r15551 r15579  
    117117
    118118
     119# Default target: make gsdlcolservr.a
     120all: $(LIBRARY)
     121
    119122gsdlcolservr.a: $(OBJECTS)
    120     rm -f gsdlcolservr.a
    121     $(AR) cru gsdlcolservr.a $(OBJECTS)
    122     $(RANLIB) gsdlcolservr.a
    123 
    124 all: $(LIBRARY)
     123    rm -f $(LIBRARY)
     124    $(AR) cru $(LIBRARY) $(OBJECTS)
     125    $(RANLIB) $(LIBRARY)
    125126
    126127install: $(LIBRARY)
    127128
    128129clean:
    129     rm -f $(OBJECTS)
     130    rm -f $(OBJECTS) $(LIBRARY)
    130131
    131132distclean:
    132     rm -f $(OBJECTS) Makefile
     133    rm -f $(OBJECTS) $(LIBRARY) Makefile
    133134
    134135depend:

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

    r15578 r15579  
    124124all: $(EXECUTABLES)
    125125
    126 
    127126corbaserver: $(CORBASERVER_EXECUTABLE_OBJECTS)
    128127    $(LINK) $(CORBASERVER_EXECUTABLE_OBJECTS) $(LIBS)
    … …  
    130129corbarecptldd: $(CORBARECPT_EXECUTABLE_OBJECTS)
    131130    $(LINK) $(CORBARECPT_EXECUTABLE_OBJECTS) $(LIBS)
    132 
    133131
    134132install:

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

    r15574 r15579  
    121121
    122122
     123# Default target: make the oaiserver executable
     124all: $(EXECUTABLE)
     125
    123126oaiserver: $(EXECUTABLE_OBJECTS)
    124127    $(CXXLINK) $(EXECUTABLE_OBJECTS) $(LIBS)
    125 
    126 all: $(EXECUTABLE)
    127128
    128129install: $(EXECUTABLE)

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

    r15572 r15579  
    6262
    6363
     64# Default target: make gsdlprotocol.a
     65all: $(LIBRARY)
     66
    6467gsdlprotocol.a: $(OBJECTS)
    65     rm -f gsdlprotocol.a
    66     $(AR) cru gsdlprotocol.a $(OBJECTS)
    67     $(RANLIB) gsdlprotocol.a
    68 
    69 all: $(LIBRARY)
     68    rm -f $(LIBRARY)
     69    $(AR) cru $(LIBRARY) $(OBJECTS)
     70    $(RANLIB) $(LIBRARY)
    7071
    7172install: $(LIBRARY)
    7273
    7374clean:
    74     rm -f $(OBJECTS)
     75    rm -f $(OBJECTS) $(LIBRARY)
    7576
    7677distclean:
    77     rm -f $(OBJECTS) Makefile
     78    rm -f $(OBJECTS) $(LIBRARY) Makefile
    7879
    7980depend:

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

    r15577 r15579  
    194194
    195195
     196# Default target: make both gsdlrecpt.a and the library executable
     197all: $(LIBRARY) $(EXECUTABLE)
     198
    196199gsdlrecpt.a: $(OBJECTS)
    197     rm -f gsdlrecpt.a
    198     $(AR) cru gsdlrecpt.a $(OBJECTS)
    199     $(RANLIB) gsdlrecpt.a
     200    rm -f $(LIBRARY)
     201    $(AR) cru $(LIBRARY) $(OBJECTS)
     202    $(RANLIB) $(LIBRARY)
    200203
    201204library: $(EXECUTABLE_OBJECTS)
    202205    $(CXXLINK) $(EXECUTABLE_OBJECTS) $(LIBS)
    203206
    204 all: $(LIBRARY) $(EXECUTABLE)
    205 
    206207install: $(EXECUTABLE)
    207208    $(INSTALL) -m 755 -s $(EXECUTABLE) $(GSDL_DIR)/cgi-bin
    208209
    209210clean:
    210     rm -f $(OBJECTS) $(EXECUTABLE)
     211    rm -f $(OBJECTS) $(LIBRARY) $(EXECUTABLE)
    211212
    212213distclean:
    213     rm -f $(OBJECTS) $(EXECUTABLE) Makefile
     214    rm -f $(OBJECTS) $(LIBRARY) $(EXECUTABLE) Makefile
    214215
    215216depend:

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

    r15550 r15579  
    9090LIBRARY = gsdlz3950.a
    9191
    92 gsdlz3950.a: $(LIBRARY_OBJECTS)
    93     rm -f gsdlz3950.a
    94     $(AR) cru gsdlz3950.a $(LIBRARY_OBJECTS) $(PACKAGES_DIR)/yaz/yaz-2.1.4/client/tabcomplete.o
    95     $(RANLIB) gsdlz3950.a
    96 
    97 
    9892SOURCES = \
    9993    z3950explain.cpp \
    … …  
    125119
    126120
    127 z3950server: $(OBJECTS)
     121# Default target: make both gsdlz3950.a and the z3950server executable
     122all: $(LIBRARY) $(EXECUTABLE)
     123
     124gsdlz3950.a: $(LIBRARY_OBJECTS)
     125    rm -f $(LIBRARY)
     126    $(AR) cru $(LIBRARY) $(LIBRARY_OBJECTS) $(PACKAGES_DIR)/yaz/yaz-2.1.4/client/tabcomplete.o
     127    $(RANLIB) $(LIBRARY)
     128
     129z3950server: $(EXECUTABLE_OBJECTS)
    128130    $(CPPLINK) $(EXECUTABLE_OBJECTS) $(LIBS)
    129131
    130 all: $(LIBRARY) $(EXECUTABLE)
    131 
    132 install: $(LIBRARY) $(EXECUTABLE)
     132install: $(EXECUTABLE)
    133133    $(INSTALL) -m 755 -s $(EXECUTABLE) $(GSDL_DIR)/bin/$(GSDLOS)
    134134
    135135clean:
    136     rm -f $(OBJECTS)
     136    rm -f $(OBJECTS) $(LIBRARY) $(EXECUTABLE)
    137137
    138138distclean:
    139     rm -f $(OBJECTS) Makefile
     139    rm -f $(OBJECTS) $(LIBRARY) $(EXECUTABLE) Makefile
    140140
    141141depend:
Note: See TracChangeset for help on using the changeset viewer.