Changeset 15579 for gsdl/trunk/src/z3950/Makefile.in

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.

File:

• gsdl/trunk/src/z3950/Makefile.in (modified) (2 diffs)

gsdl/trunk/src/z3950/Makefile.in

@@ -90 +90 @@
 LIBRARY = gsdlz3950.a
 
-gsdlz3950.a: $(LIBRARY_OBJECTS)
-    rm -f gsdlz3950.a
-    $(AR) cru gsdlz3950.a $(LIBRARY_OBJECTS) $(PACKAGES_DIR)/yaz/yaz-2.1.4/client/tabcomplete.o
-    $(RANLIB) gsdlz3950.a
-
-
 SOURCES = \
     z3950explain.cpp \
@@ -125 +119 @@
 
 
-z3950server: $(OBJECTS)
+# Default target: make both gsdlz3950.a and the z3950server executable
+all: $(LIBRARY) $(EXECUTABLE)
+
+gsdlz3950.a: $(LIBRARY_OBJECTS)
+    rm -f $(LIBRARY)
+    $(AR) cru $(LIBRARY) $(LIBRARY_OBJECTS) $(PACKAGES_DIR)/yaz/yaz-2.1.4/client/tabcomplete.o
+    $(RANLIB) $(LIBRARY)
+
+z3950server: $(EXECUTABLE_OBJECTS)
     $(CPPLINK) $(EXECUTABLE_OBJECTS) $(LIBS)
 
-all: $(LIBRARY) $(EXECUTABLE)
-
-install: $(LIBRARY) $(EXECUTABLE)
+install: $(EXECUTABLE)
     $(INSTALL) -m 755 -s $(EXECUTABLE) $(GSDL_DIR)/bin/$(GSDLOS)
 
 clean:
-    rm -f $(OBJECTS)
+    rm -f $(OBJECTS) $(LIBRARY) $(EXECUTABLE)
 
 distclean:
-    rm -f $(OBJECTS) Makefile
+    rm -f $(OBJECTS) $(LIBRARY) $(EXECUTABLE) Makefile
 
 depend: