Merge changes from CUPS 1.4svn-r7874.

[thirdparty/cups.git] / systemv / Makefile

diff --git a/systemv/Makefile b/systemv/Makefile
index 285e7a6ae76b888cd443e9f3ecc8b78b892925a6..8d95c1fc16f3de8ec8d250dc95837eafd22c974a 100644 (file)
--- a/systemv/Makefile
+++ b/systemv/Makefile
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $"
+# "$Id: Makefile 7558 2008-05-12 23:46:44Z mike $"
 #
 #   System V commands makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007 by Apple Inc.
+#   Copyright 2007-2008 by Apple Inc.
 #   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -29,6 +29,20 @@ OBJS =       accept.o cancel.o cupsaddsmb.o cupsctl.o cupstestdsc.o \
 all:   $(TARGETS)
 
 
+#
+# Make library targets...
+#
+
+libs:
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
 #
 # Clean all object files...
 #
@@ -49,7 +63,21 @@ depend:
 # Install all targets...
 #
 
-install:       all
+install:       all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
+
+
+#
+# Install programs...
+#
+
+install-exec:
        $(INSTALL_DIR) -m 755 $(SBINDIR)
        $(INSTALL_BIN) accept $(SBINDIR)
        $(RM) $(SBINDIR)/reject
@@ -70,7 +98,7 @@ install:      all
        $(INSTALL_BIN) lp $(BINDIR)
        $(INSTALL_BIN) lpoptions $(BINDIR)
        $(INSTALL_BIN) lpstat $(BINDIR)
-       $(INSTALL_BIN) -m 4755 -o root lppasswd $(BINDIR) || $(INSTALL_BIN) lppasswd $(BINDIR)
+       $(INSTALL_BIN) lppasswd $(BINDIR)
        if test "x$(SYMROOT)" != "x"; then \
                $(INSTALL_DIR) $(SYMROOT); \
                for file in $(TARGETS); do \
@@ -79,6 +107,20 @@ install:    all
        fi
 
 
+#
+# Install headers...
+#
+
+install-headers:
+
+
+#
+# Install libraries...
+#
+
+install-libs:
+
+
 #
 # Uninstall all targets...
 #
@@ -160,6 +202,11 @@ cupstestppd:       cupstestppd.o ../cups/$(LIBCUPS) ../filter/$(LIBCUPSIMAGE)
        echo Linking $@...
        $(CC) $(LDFLAGS) -o $@ cupstestppd.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
 
+cupstestppd-static:    cupstestppd.o ../cups/libcups.a ../filter/libcupsimage.a
+       echo Linking $@...
+       $(CC) $(LDFLAGS) -o $@ cupstestppd.o ../filter/libcupsimage.a \
+               ../cups/libcups.a $(IMGLIBS) $(LIBGSSAPI) $(LIBS) $(LIBZ)
+
 
 #
 # lp
@@ -232,5 +279,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 6649 2007-07-11 21:46:42Z mike $".
+# End of "$Id: Makefile 7558 2008-05-12 23:46:44Z mike $".
 #