Merge changes from CUPS 1.6svn-r9939.

[thirdparty/cups.git] / Makefile

diff --git a/Makefile b/Makefile
index d215c47f4032cd72559c18016e99201e9e234dda..96c73aba83e85ed8229133c535d12debce207061 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 7961 2008-09-17 19:52:46Z mike $"
+# "$Id: Makefile 9391 2010-11-30 21:53:04Z mike $"
 #
 #   Top-level Makefile for CUPS.
 #
@@ -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)
 
 
 #
@@ -170,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;\
@@ -190,8 +182,8 @@ install-headers:
        done
        if test "x$(privateinclude)" != x; then \
                echo Installing config.h into $(PRIVATEINCLUDE)...; \
-               $(INSTALLDIR) -m 755 $(PRIVATEINCLUDE); \
-               $(INSTALL_DATA) config.h $(PRIVATEINCLUDE); \
+               $(INSTALL_DIR) -m 755 $(PRIVATEINCLUDE); \
+               $(INSTALL_DATA) config.h $(PRIVATEINCLUDE)/config.h; \
        fi
 
 
@@ -288,6 +280,16 @@ docset:    apihelp
                org.cups.docset
 
 
+#
+# Lines of code computation...
+#
+
+sloc:
+       for dir in cups scheduler; do \
+               (cd $$dir; $(MAKE) $(MFLAGS) sloc) || exit 1;\
+       done
+
+
 #
 # Make software distributions using EPM (http://www.epmhome.org/)...
 #
@@ -300,9 +302,6 @@ aix bsd deb depot inst pkg setld slackware swinstall tardist:
 epm:
        epm $(EPMFLAGS) -s packaging/installer.gif cups packaging/cups.list
 
-osx:
-       epm $(EPMFLAGS) -f osx -s packaging/installer.tif cups packaging/cups.list
-
 rpm:
        epm $(EPMFLAGS) -f rpm -s packaging/installer.gif cups packaging/cups.list
 
@@ -320,5 +319,12 @@ dist:      all
 
 
 #
-# End of "$Id: Makefile 7961 2008-09-17 19:52:46Z mike $".
+# Don't run top-level build targets in parallel...
+#
+
+.NOTPARALLEL:
+
+
+#
+# End of "$Id: Makefile 9391 2010-11-30 21:53:04Z mike $".
 #