Load cups into easysw/current.

[thirdparty/cups.git] / Makefile

diff --git a/Makefile b/Makefile
index 5d28e1bfa05b43629cfae3c6a62371b595132b99..428bf20fe92548d2fd5c3a2c0afebe0c0c851cc9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile 4835 2005-11-12 22:00:16Z mike $"
+# "$Id: Makefile 5136 2006-02-19 18:46:46Z mike $"
 #
 #   Top-level Makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2004 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -28,8 +28,9 @@ include Makedefs
 # Directories to make...
 #
 
-DIRS   =       cups backend berkeley cgi-bin filter man pdftops \
-               notifier scheduler systemv
+DIRS   =       cups backend berkeley cgi-bin filter locale man monitor \
+               notifier pdftops scheduler systemv test
+
 
 #
 # Make all targets...
@@ -42,6 +43,7 @@ all:
                (cd $$dir ; $(MAKE) $(MFLAGS)) || exit 1;\
        done
 
+
 #
 # Remove object and target files...
 #
@@ -52,6 +54,7 @@ clean:
                (cd $$dir; $(MAKE) $(MFLAGS) clean) || exit 1;\
        done
 
+
 #
 # Make dependencies
 #
@@ -80,8 +83,6 @@ install:      installhdrs
        (cd doc; $(MAKE) $(MFLAGS) install)
        echo Installing in fonts...
        (cd fonts; $(MAKE) $(MFLAGS) install)
-       echo Installing in locale...
-       (cd locale; $(MAKE) $(MFLAGS) install)
        echo Installing in ppd...
        (cd ppd; $(MAKE) $(MFLAGS) install)
        echo Installing in templates...
@@ -92,27 +93,33 @@ install:    installhdrs
        echo Installing startup script...
        if test "x$(INITDIR)" != "x"; then \
                $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \
-               $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
+               $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
                $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc0.d; \
-               $(INSTALL_SCRIPT) cups.sh  $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
+               $(INSTALL_SCRIPT) init/cups.sh  $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
                $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc2.d; \
-               $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
+               $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
                $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc3.d; \
-               $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
+               $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
                $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc5.d; \
-               $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
+               $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
        fi
        if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
                $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
                if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
-                       $(INSTALL_SCRIPT) cups.osx $(BUILDROOT)$(INITDDIR)/PrintingServices; \
-                       $(INSTALL_DATA) cups.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
+                       $(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \
+                       $(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
                        $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
-                       $(INSTALL_DATA) cups.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
+                       $(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
+               elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
+                       $(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
                else \
-                       $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
+                       $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
                fi \
        fi
+       if test "x$(DBUSDIR)" != "x"; then \
+               $(INSTALL_DIR) $(BUILDROOT)$(DBUSDIR); \
+               $(INSTALL_DATA) packaging/cups-dbus.conf $(BUILDROOT)$(DBUSDIR)/cups.conf; \
+       fi
 
 
 #
@@ -120,7 +127,7 @@ install:    installhdrs
 #
 
 installsrc:
-       gnutar --dereference --exclude=CVS -cf - . | gnutar -C $(SRCROOT) -xf -
+       gnutar --dereference --exclude=.svn -cf - . | gnutar -C $(SRCROOT) -xf -
 
 installhdrs:
        (cd cups ; $(MAKE) $(MFLAGS) installhdrs) || exit 1;\
@@ -166,6 +173,7 @@ pkg:
 tardist:
        epm $(EPMFLAGS) -f tardist cups packaging/cups.list
 
+
 #
-# End of "$Id: Makefile 4835 2005-11-12 22:00:16Z mike $".
+# End of "$Id: Makefile 5136 2006-02-19 18:46:46Z mike $".
 #