Merge changes from CUPS 1.5svn-r9602.

[thirdparty/cups.git] / Makefile

diff --git a/Makefile b/Makefile
index 9ccc129921f7da6ca68e8164366ffb51323043b8..3babe2cc3cac203198a4cf516a384619c87374f0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 #
 # "$Id: Makefile 7961 2008-09-17 19:52:46Z mike $"
 #
-#   Top-level Makefile for the Common UNIX Printing System (CUPS).
+#   Top-level Makefile for CUPS.
 #
-#   Copyright 2007-2009 by Apple Inc.
+#   Copyright 2007-2010 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -16,21 +16,11 @@
 include Makedefs
 
 
-#
-# Don't run top-level build targets in parallel...
-#
-
-.NOTPARALLEL:
-
-
 #
 # Directories to make...
 #
 
-DIRS   =       cups filter backend berkeley cgi-bin driver locale man monitor \
-               notifier ppdc scheduler systemv test \
-               $(PHPDIR) \
-               conf data desktop doc examples $(FONTS) templates
+DIRS   =       cups test $(BUILDDIRS) $(PHPDIR) $(FONTS)
 
 
 #
@@ -119,7 +109,7 @@ distclean:  clean
        $(RM) packaging/cups-desc.plist packaging/cups-info.plist
        $(RM) templates/header.tmpl
        $(RM) desktop/cups.desktop
-       $(RM) scheduler/cups.sh scheduler/cups-lpd
+       $(RM) scheduler/cups.sh scheduler/cups-lpd.xinetd
        $(RM) scheduler/org.cups.cups-lpd.plist scheduler/cups.xml
        -$(RM) doc/*/index.html
        -$(RM) templates/*/header.tmpl
@@ -142,10 +132,12 @@ depend:
 # (at least checker-231 is required for scan-build to work this way)
 #
 
-.PHONY: clang
+.PHONY: clang clang-changes
 clang:
        $(RM) -r clang
        scan-build -V -k -o `pwd`/clang $(MAKE) $(MFLAGS) clean all
+clang-changes:
+       scan-build -V -k -o `pwd`/clang $(MAKE) $(MFLAGS) all
 
 
 #
@@ -168,6 +160,8 @@ install:    install-data install-headers install-libs install-exec
 #
 
 install-data:
+       echo Making all in cups...
+       (cd cups; $(MAKE) $(MFLAGS) all)
        for dir in $(DIRS); do\
                echo Installing data files in $$dir... ;\
                (cd $$dir; $(MAKE) $(MFLAGS) install-data) || exit 1;\
@@ -186,6 +180,11 @@ install-headers:
                echo Installing header files in $$dir... ;\
                (cd $$dir; $(MAKE) $(MFLAGS) install-headers) || exit 1;\
        done
+       if test "x$(privateinclude)" != x; then \
+               echo Installing config.h into $(PRIVATEINCLUDE)...; \
+               $(INSTALL_DIR) -m 755 $(PRIVATEINCLUDE); \
+               $(INSTALL_DATA) config.h $(PRIVATEINCLUDE)/config.h; \
+       fi
 
 
 #
@@ -282,7 +281,7 @@ docset:     apihelp
 
 
 #
-# Make software distributions using EPM (http://www.easysw.com/epm/)...
+# Make software distributions using EPM (http://www.epmhome.org/)...
 #
 
 EPMFLAGS       =       -v --output-dir dist $(EPMARCH)