Merge fixes from CUPS 1.4svn-r7555.

[thirdparty/cups.git] / Makefile

diff --git a/Makefile b/Makefile
index 1bf76413c0d12b7db81f006d4fea15e4f85c5342..3b2c44eade67c24ab7610f1d41346e800f5c5dfa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 #
 #   Top-level Makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007 by Apple Inc.
+#   Copyright 2007-2008 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -19,10 +19,10 @@ include Makedefs
 # Directories to make...
 #
 
-DIRS   =       cups backend berkeley cgi-bin filter locale man monitor \
-               notifier $(PDFTOPS) scheduler systemv test \
+DIRS   =       cups filter backend berkeley cgi-bin driver locale man monitor \
+               notifier ppdc scheduler systemv test \
                $(PHPDIR) \
-               conf data doc $(FONTS) ppd templates
+               conf data doc $(FONTS) templates
 
 
 #
@@ -31,6 +31,10 @@ DIRS =       cups backend berkeley cgi-bin filter locale man monitor \
 
 all:
        chmod +x cups-config
+       echo Using ALL_CFLAGS="$(ALL_CFLAGS)"
+       echo Using ALL_CXXFLAGS="$(ALL_CXXFLAGS)"
+       echo Using LDFLAGS="$(LDFLAGS)"
+       echo Using LIBS="$(LIBS)"
        for dir in $(DIRS); do\
                echo Making all in $$dir... ;\
                (cd $$dir ; $(MAKE) $(MFLAGS)) || exit 1;\
@@ -89,13 +93,20 @@ ctags:
 
 
 #
-# Install object and target files...
+# Install everything...
 #
 
-install:       installhdrs
+install:       install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
        for dir in $(DIRS); do\
-               echo Installing in $$dir... ;\
-               (cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
+               echo Installing data files in $$dir... ;\
+               (cd $$dir; $(MAKE) $(MFLAGS) install-data) || exit 1;\
        done
        echo Installing cups-config script...
        $(INSTALL_DIR) -m 755 $(BINDIR)
@@ -163,17 +174,37 @@ install:  installhdrs
                $(INSTALL_DATA) desktop/cups-128.png $(BUILDROOT)$(ICONDIR)/hicolor/128x128/apps/cups.png; \
        fi
 
+#
+# Install header files...
+#
+
+install-headers:
+       for dir in $(DIRS); do\
+               echo Installing header files in $$dir... ;\
+               (cd $$dir; $(MAKE) $(MFLAGS) install-headers) || exit 1;\
+       done
+
 
 #
-# Install source and header files...
+# Install programs...
 #
 
-installsrc:
-       gnutar --dereference --exclude=.svn -cf - . | gnutar -C $(SRCROOT) -xf -
+install-exec:
+       for dir in $(DIRS); do\
+               echo Installing programs in $$dir... ;\
+               (cd $$dir; $(MAKE) $(MFLAGS) all install-exec) || exit 1;\
+       done
 
-installhdrs:
-       (cd cups ; $(MAKE) $(MFLAGS) installhdrs) || exit 1;\
-       (cd filter ; $(MAKE) $(MFLAGS) installhdrs) || exit 1;
+
+#
+# Install libraries...
+#
+
+install-libs:
+       for dir in $(DIRS); do\
+               echo Installing libraries in $$dir... ;\
+               (cd $$dir; $(MAKE) $(MFLAGS) all install-libs) || exit 1;\
+       done
 
 
 #