Add uninstall targets and RMDIR command.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@5229 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/Makedefs.in b/Makedefs.in
index 384bd6f554dcd9a6ba4ac219f4ec02712e2418ab..c22d4dfad8f5199addd671eecb21d2b675e344c8 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -40,6 +40,7 @@ MV            =       @MV@
 PHPCONFIG      =       @PHPCONFIG@
 RANLIB         =       @RANLIB@
 RM             =       @RM@ -f
+RMDIR          =       @RMDIR@
 SED            =       @SED@
 SHELL          =       /bin/sh
 STRIP          =       @STRIP@

diff --git a/Makefile b/Makefile
index 5fc932ccc2708dfe50ea55384b93cbae502964ed..be1b117889646e8b859fac6c09c9a7d33de36217 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,8 @@ include Makedefs
 
 DIRS   =       cups backend berkeley cgi-bin filter locale man monitor \
                notifier pdftops scheduler systemv test \
-               $(PHPDIR)
+               $(PHPDIR) \
+               conf data doc fonts ppd templates
 
 
 #
@@ -76,32 +77,20 @@ install:    installhdrs
                echo Installing in $$dir... ;\
                (cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
        done
-       echo Installing in conf...
-       (cd conf; $(MAKE) $(MFLAGS) install)
-       echo Installing in data...
-       (cd data; $(MAKE) $(MFLAGS) install)
-       echo Installing in doc...
-       (cd doc; $(MAKE) $(MFLAGS) install)
-       echo Installing in fonts...
-       (cd fonts; $(MAKE) $(MFLAGS) install)
-       echo Installing in ppd...
-       (cd ppd; $(MAKE) $(MFLAGS) install)
-       echo Installing in templates...
-       (cd templates; $(MAKE) $(MFLAGS) install)
        echo Installing cups-config script...
-       $(INSTALL_DIR) $(BINDIR)
+       $(INSTALL_DIR) -m 755 $(BINDIR)
        $(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
        echo Installing startup script...
        if test "x$(INITDIR)" != "x"; then \
-               $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \
+               $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
                $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
-               $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc0.d; \
+               $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
                $(INSTALL_SCRIPT) init/cups.sh  $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
-               $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc2.d; \
+               $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc2.d; \
                $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
-               $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc3.d; \
+               $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc3.d; \
                $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
-               $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc5.d; \
+               $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc5.d; \
                $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
        fi
        if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
@@ -109,7 +98,7 @@ install:     installhdrs
                if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
                        $(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \
                        $(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
-                       $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
+                       $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
                        $(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); \
@@ -119,7 +108,7 @@ install:    installhdrs
        fi
        if test "x$(DBUSDIR)" != "x"; then \
                echo Installing cups.conf in $(DBUSDIR)...;\
-               $(INSTALL_DIR) $(BUILDROOT)$(DBUSDIR); \
+               $(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR); \
                $(INSTALL_DATA) packaging/cups-dbus.conf $(BUILDROOT)$(DBUSDIR)/cups.conf; \
        fi
 
@@ -136,6 +125,51 @@ installhdrs:
        (cd filter ; $(MAKE) $(MFLAGS) installhdrs) || exit 1;
 
 
+#
+# Uninstall object and target files...
+#
+
+uninstall:
+       for dir in $(DIRS); do\
+               echo Uninstalling in $$dir... ;\
+               (cd $$dir; $(MAKE) $(MFLAGS) uninstall) || exit 1;\
+       done
+       echo Uninstalling cups-config script...
+       $(RM) $(BINDIR)/cups-config
+       -$(RMDIR) $(BINDIR)
+       echo Uninstalling startup script...
+       if test "x$(INITDIR)" != "x"; then \
+               $(RM) $(BUILDROOT)$(INITDIR)/init.d/cups; \
+               $(RMDIR) $(BUILDROOT)$(INITDIR)/init.d; \
+               $(RM)  $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
+               $(RMDIR) $(BUILDROOT)$(INITDIR)/rc0.d; \
+               $(RM) $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
+               $(RMDIR) $(BUILDROOT)$(INITDIR)/rc2.d; \
+               $(RM) $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
+               $(RMDIR) $(BUILDROOT)$(INITDIR)/rc3.d; \
+               $(RM) $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
+               $(RMDIR) $(BUILDROOT)$(INITDIR)/rc5.d; \
+       fi
+       if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
+               if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
+                       $(RM) $(BUILDROOT)$(INITDDIR)/PrintingServices; \
+                       $(RM) $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
+                       $(RM) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
+                       $(RMDIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
+               elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
+                       $(RM) $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
+               else \
+                       $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
+               fi \
+               $(RMDIR) $(BUILDROOT)$(INITDDIR); \
+       fi
+       if test "x$(DBUSDIR)" != "x"; then \
+               echo Uninstalling cups.conf in $(DBUSDIR)...;\
+               $(RM) $(BUILDROOT)$(DBUSDIR)/cups.conf; \
+               $(RMDIR) $(BUILDROOT)$(DBUSDIR); \
+       fi
+
+
 #
 # Run the test suite...
 #

diff --git a/backend/Makefile b/backend/Makefile
index b9cf23544996dfb088ded2870926c0fbdbe5ee34..94633e376ac3fcff43f174a7b847fe90b2d51fd5 100644 (file)
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -72,6 +72,19 @@ install:     all
        $(LN) ipp $(SERVERBIN)/backend/http
 
 
+#
+# Uninstall all targets...
+#
+
+uninstall:
+       for file in $(RBACKENDS) $(UBACKENDS); do \
+               $(RM) $(SERVERBIN)/backend/$$file; \
+       done
+       $(RM) $(SERVERBIN)/backend/http
+       -$(RMDIR) $(SERVERBIN)/backend
+       -$(RMDIR) $(SERVERBIN)
+
+
 #
 # betest
 #

diff --git a/berkeley/Makefile b/berkeley/Makefile
index 03413e801be701ddcf7e9f72155adaf46299bff1..c6abed8f3b9fe0933c2912921c8a0a7de98fcf4d 100644 (file)
--- a/berkeley/Makefile
+++ b/berkeley/Makefile
@@ -64,6 +64,19 @@ install:     all
        $(INSTALL_BIN) lpc $(SBINDIR)
 
 
+#
+# Uninstall all targets...
+#
+
+uninstall:
+       $(RM) $(BINDIR)/lpq
+       $(RM) $(BINDIR)/lpr
+       $(RM) $(BINDIR)/lprm
+       $(RM) $(SBINDIR)/lpc
+       -$(RMDIR) $(SBINDIR)
+       -$(RMDIR) $(BINDIR)
+
+
 #
 # lpc
 #

diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index 17d672e9d95d7e2f9a6b0a0af7a3f108aaf4eb02..7fb8a24eba5c0e3067868d39980ed7f314c038b9 100644 (file)
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -65,6 +65,17 @@ install:     all
        done
 
 
+#
+# Uninstall all targets...
+#
+
+uninstall:
+       for file in $(CGIS); do \
+               $(RM) $(SERVERBIN)/cgi-bin/$$file; \
+       done
+       -$(RMDIR) $(SERVERBIN)/cgi-bin
+
+
 #
 # libcgi.a
 #

diff --git a/conf/Makefile b/conf/Makefile
index 684598dcc9e0f89d3b8f04c2ed60a3249de88a4a..f6146dc305712b9e3ffbe10cb7e67e7695ddf813 100644 (file)
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -46,6 +46,13 @@ all:
 clean:
 
 
+#
+# Dummy depend...
+#
+
+depend:
+
+
 #
 # Install files...
 #
@@ -80,6 +87,21 @@ install:     all
        fi
 
 
+#
+# Uninstall files...
+#
+
+uninstall:
+       for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
+               $(RM) $(SERVERROOT)/$$file; \
+       done
+       -$(RMDIR) $(SERVERROOT)
+       -if test x$(PAMDIR) != x; then \
+               $(RM) $(BUILDROOT)$(PAMDIR)/cups; \
+               $(RMDIR) $(BUILDROOT)$(PAMDIR); \
+       fi
+
+
 #
 # End of "$Id$".
 #

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 267f68875f3447db0cd0cc4a84365094ebe15e50..0646cfb3de404daeea01f0fbf4256231c7745ede 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -63,6 +63,7 @@ AC_PATH_PROG(LD,ld)
 AC_PATH_PROG(LN,ln)
 AC_PATH_PROG(MV,mv)
 AC_PATH_PROG(RM,rm)
+AC_PATH_PROG(RM,rmdir)
 AC_PATH_PROG(SED,sed)
 AC_PATH_PROG(STRIP,strip)
 

diff --git a/cups/Dependencies b/cups/Dependencies
index 9b68b129992b7f7a6cd25facdf1e4987cbc5d2a4..90f9a6e4ab1454d5c91e26f9b32c5150d604712f 100644 (file)
--- a/cups/Dependencies
+++ b/cups/Dependencies
@@ -45,7 +45,8 @@ language.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
 language.o: array.h file.h language.h i18n.h normalize.h transcode.h debug.h
 localize.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h
 localize.o: array.h file.h language.h i18n.h normalize.h transcode.h debug.h
-mark.o: ppd.h array.h file.h string.h ../config.h debug.h
+mark.o: cups.h ipp.h http.h string.h ../config.h md5.h ppd.h array.h file.h
+mark.o: language.h debug.h
 md5.o: md5.h string.h ../config.h
 md5passwd.o: http.h string.h ../config.h md5.h
 normalize.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h

diff --git a/cups/Makefile b/cups/Makefile
index ed365bc700a6341ca9426215db477b14146c8ab6..5d7f2fb7a67d776846e4e4934b2b616716bac406 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -169,6 +169,26 @@ installhdrs:
        done
 
 
+#
+# Uninstall object and target files...
+#
+
+uninstall:
+       $(RM) $(LIBDIR)/libcups.2.dylib
+       $(RM) $(LIBDIR)/libcups.a
+       $(RM) $(LIBDIR)/libcups.dylib
+       $(RM) $(LIBDIR)/libcups_s.a
+       $(RM) $(LIBDIR)/libcups.sl
+       $(RM) $(LIBDIR)/libcups.sl.2
+       $(RM) $(LIBDIR)/libcups.so
+       $(RM) $(LIBDIR)/libcups.so.2
+       -$(RMDIR) $(LIBDIR)
+       for file in $(HEADERS); do \
+               $(RM) $(INCLUDEDIR)/cups/$$file; \
+       done
+       -$(RMDIR) $(INCLUDEDIR)/cups
+
+
 #
 # libcups.so.2, libcups.sl.2
 #

diff --git a/data/Makefile b/data/Makefile
index de41b97d6919db5c252c79f2c3e7274aa38f392e..be5d297eda6824a2b001eb7d48973ef79ba73ab3 100644 (file)
--- a/data/Makefile
+++ b/data/Makefile
@@ -133,6 +133,13 @@ all:
 clean:
 
 
+#
+# Dummy depend...
+#
+
+depend:
+
+
 #
 # Install files...
 #
@@ -157,6 +164,31 @@ install:   all
        $(INSTALL_DIR) -m 755 $(DATADIR)/profiles
 
 
+#
+# Uninstall files...
+#
+
+uninstall:
+       for file in $(BANNERS); do \
+               $(RM) $(DATADIR)/banners/$$file; \
+       done
+       for file in $(CHARMAPS); do \
+               $(RM) $(DATADIR)/charmaps/$$file; \
+       done
+       for file in $(CHARSETS); do \
+               $(RM) $(DATADIR)/charsets/$$file; \
+       done
+       for file in $(DATAFILES); do \
+               $(RM) $(DATADIR)/data/$$file; \
+       done
+       -$(RMDIR) $(DATADIR)/profiles
+       -$(RMDIR) $(DATADIR)/data
+       -$(RMDIR) $(DATADIR)/charsets
+       -$(RMDIR) $(DATADIR)/charmaps
+       -$(RMDIR) $(DATADIR)/banners
+       -$(RMDIR) $(DATADIR)
+
+
 #
 # End of "$Id$".
 #

diff --git a/doc/Makefile b/doc/Makefile
index cc99191c0ccd51f200a61ea7dbacedb808206bd8..208d437c0d902caed2f2f62eb08768c883091921 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -187,6 +187,13 @@ all:
 clean:
 
 
+#
+# Dummy depend target...
+#
+
+depend:
+
+
 #
 # Install all documentation files...
 #
@@ -217,6 +224,33 @@ install:   all
        done
 
 
+#
+# Unnstall all documentation files...
+#
+
+uninstall:
+       for file in $(WEBPAGES); do \
+               $(RM) $(DOCDIR)/$$file; \
+       done
+       for file in $(HELPFILES); do \
+               $(INSTALL_MAN) $(DOCDIR)/help/$$file; \
+       done
+       for file in $(WEBIMAGES) $(WEBBUTTONS); do \
+               $(INSTALL_MAN) $(DOCDIR)/images/$$file; \
+       done
+       -for lang in $(LANGUAGES); do \
+               $(RM) $(DOCDIR)/$$lang/index.html; \
+               for file in $(WEBBUTTONS); do \
+                       $(RM) $(DOCDIR)/$$lang/images/$$file; \
+               done \
+               $(RMDIR) $(DOCDIR)/$$lang/images; \
+               $(RMDIR) $(DOCDIR)/$$lang; \
+       done
+       -$(RMDIR) $(DOCDIR)/images
+       -$(RMDIR) $(DOCDIR)/help
+       -$(RMDIR) $(DOCDIR)
+
+
 #
 # End of Makefile.
 #

diff --git a/filter/Makefile b/filter/Makefile
index e026e2f27b9bb11a298dec8934d70027f48ce7b4..1f62ae6f3b17e413f439cd18ef23a839650eb1fd 100644 (file)
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -103,6 +103,31 @@ installhdrs:
        $(INSTALL_DATA) raster.h $(INCLUDEDIR)/cups
 
 
+#
+# Uninstall all targets...
+#
+
+uninstall:
+       for file in $(FILTERS); do \
+               $(RM) $(SERVERBIN)/filter/$$file; \
+       done
+       $(RM) $(SERVERBIN)/filter/rastertodymo
+       -$(RMDIR) $(SERVERBIN)/filter
+       -$(RMDIR) $(SERVERBIN)
+       $(RM) $(LIBDIR)/libcupsimage.2.dylib
+       $(RM) $(LIBDIR)/libcupsimage.a
+       $(RM) $(LIBDIR)/libcupsimage.dylib
+       $(RM) $(LIBDIR)/libcupsimage_s.a
+       $(RM) $(LIBDIR)/libcupsimage.sl
+       $(RM) $(LIBDIR)/libcupsimage.sl.2
+       $(RM) $(LIBDIR)/libcupsimage.so
+       $(RM) $(LIBDIR)/libcupsimage.so.2
+       -$(RMDIR) $(LIBDIR)
+       $(RM) $(INCLUDEDIR)/cups/image.h
+       $(RM) $(INCLUDEDIR)/cups/raster.h
+       -$(RMDIR) $(INCLUDEDIR)/cups
+
+
 #
 # Automatic API help files...
 #

diff --git a/fonts/Makefile b/fonts/Makefile
index ad7aed8f608eb56c67d0c8dcb35cb4437e284751..c3b00ae4f659a73bbd7dd2c9f19c008633a1440c 100644 (file)
--- a/fonts/Makefile
+++ b/fonts/Makefile
@@ -46,6 +46,13 @@ all:
 clean:
 
 
+#
+# Dummy depend target...
+#
+
+depend:
+
+
 #
 # Install files...
 #
@@ -57,6 +64,17 @@ install:     all
        done
 
 
+#
+# Uninstall files...
+#
+
+uninstall:
+       for file in $(FONTS); do \
+               $(RM) $(DATADIR)/fonts/$$file; \
+       done
+       $(RMDIR) $(DATADIR)/fonts
+
+
 #
 # End of "$Id$".
 #

diff --git a/locale/Makefile b/locale/Makefile
index 264920f1cd6d52d386ebfa154f032b33ac76b437..59e64fa2178346174e9850e438d2aab9e496e8d0 100644 (file)
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -65,6 +65,18 @@ install:     all
        done
 
 
+#
+# Uninstall files...
+#
+
+uninstall:
+       -for loc in $(LANGUAGES) ; do \
+               $(RM) $(LOCALEDIR)/$$loc/cups_$$loc.po ; \
+               $(RMDIR) $(LOCALEDIR)/$$loc ; \
+       done
+       -$(RMDIR) $(LOCALEDIR)
+
+
 #
 # pot - Creates/updates the cups.pot template file, and merges changes
 #       into existing message catalogs.

diff --git a/man/Makefile b/man/Makefile
index 1d488f0e20fd7293f54d8f7fe5baf1798ded15d7..b877efe644310fb77f6d385d0dff52c3faee929f 100644 (file)
--- a/man/Makefile
+++ b/man/Makefile
@@ -127,6 +127,31 @@ install:   all
        $(LN) cupsenable.$(MAN8EXT) $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT)
 
 
+#
+# Uninstall files...
+#
+
+uninstall:
+       for file in $(MAN1); do \
+               $(RM) $(MANDIR)/man1/$$file; \
+       done
+       -$(RMDIR) $(MANDIR)/man1
+       for file in $(MAN5); do \
+               $(RM) $(MANDIR)/man5/$$file; \
+       done
+       -$(RMDIR) $(MANDIR)/man5
+       for file in $(MAN7); do \
+               $(RM) $(MANDIR)/man7/$$file; \
+       done
+       -$(RMDIR) $(MANDIR)/man7
+       for file in $(MAN8); do \
+               $(RM) $(AMANDIR)/man$(MAN8DIR)/$$file; \
+       done
+       $(RM) $(AMANDIR)/man$(MAN8DIR)/reject.$(MAN8EXT)
+       $(RM) $(AMANDIR)/man$(MAN8DIR)/cupsdisable.$(MAN8EXT)
+       -$(RMDIR) $(AMANDIR)/man$(MAN8DIR)
+
+
 #
 # Make html versions of man pages...
 #

diff --git a/monitor/Makefile b/monitor/Makefile
index ffcbebf4170022a333fd31f478fbf25e6f191391..16cf2ece7e0e87d77ab047ceb7a744628d4d00a6 100644 (file)
--- a/monitor/Makefile
+++ b/monitor/Makefile
@@ -65,6 +65,18 @@ install:     all
        done
 
 
+#
+# Uninstall all targets...
+#
+
+uninstall:
+       for file in $(TARGETS); do \
+               $(RM) $(SERVERBIN)/monitor/$$file; \
+       done
+       -$(RMDIR) $(SERVERBIN)/monitor
+       -$(RMDIR) $(SERVERBIN)
+
+
 #
 # bcp
 #

diff --git a/notifier/Makefile b/notifier/Makefile
index 61833228f389f7f940e0ea0042acebe826a41d17..fca98392a5f17664970fb6b182162f19cae32d22 100644 (file)
--- a/notifier/Makefile
+++ b/notifier/Makefile
@@ -55,6 +55,18 @@ install:     all
        done
 
 
+#
+# Uninstall all targets...
+#
+
+uninstall:
+       for file in $(TARGETS); do \
+               $(RM) $(SERVERBIN)/notifier/$$file; \
+       done
+       -$(RMDIR) $(SERVERBIN)/notifier
+       -$(RMDIR) $(SERVERBIN)
+
+
 #
 # Update dependencies (without system header dependencies...)
 #

diff --git a/pdftops/Makefile b/pdftops/Makefile
index 086ea436447635da1a59f8e58e876e1586567fa4..58971557b01916538f160e28a2db6fef28a55c6a 100644 (file)
--- a/pdftops/Makefile
+++ b/pdftops/Makefile
@@ -126,6 +126,16 @@ install:   all
        $(INSTALL_BIN) pdftops $(SERVERBIN)/filter
 
 
+#
+# Uninstall the filter...
+#
+
+uninstall:
+       $(RM) $(SERVERBIN)/filter/pdftops
+       -$(RMDIR) $(SERVERBIN)/filter
+       -$(RMDIR) $(SERVERBIN)
+
+
 #
 # pdftops
 #

diff --git a/ppd/Makefile b/ppd/Makefile
index 5840acc5d2e97f6ae9549a780b0b946cd71e9635..017040176e3e449f1103fe3f2e849e56008fd4ab 100644 (file)
--- a/ppd/Makefile
+++ b/ppd/Makefile
@@ -48,6 +48,13 @@ all:
 clean:
 
 
+#
+# Dummy depend...
+#
+
+depend:
+
+
 #
 # Install files...
 #
@@ -59,6 +66,18 @@ install:     all
        done
 
 
+#
+# Uninstall files...
+#
+
+uninstall:
+       for file in $(FILES); do \
+               $(RM) $(DATADIR)/model/$$file; \
+       done
+       -$(RMDIR) $(DATADIR)/model
+       -$(RMDIR) $(DATADIR)
+
+
 #
 # End of "$Id$".
 #

diff --git a/scheduler/Makefile b/scheduler/Makefile
index c5d68fca373bd9c60e540738771e2a667f6cc02a..367f039f1450ade32ae8b795382572474db56908 100644 (file)
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -148,6 +148,31 @@ install:   all
 #      -chgrp $(CUPS_GROUP) $(CACHEDIR)/ppd
 
 
+#
+# Uninstall the scheduler...
+#
+
+uninstall:     all
+       $(RM) $(SBINDIR)/cupsd
+       $(RM) $(SERVERBIN)/daemon/cups-deviced
+       $(RM) $(SERVERBIN)/daemon/cups-driverd
+       $(RM) $(SERVERBIN)/daemon/cups-lpd
+       $(RM) $(SERVERBIN)/daemon/cups-polld
+       -$(RMDIR) $(STATEDIR)/certs
+       -$(RMDIR) $(STATEDIR)
+       -$(RMDIR) $(SERVERROOT)/ppd
+       -$(RMDIR) $(SERVERROOT)/interfaces
+       -$(RMDIR) $(SERVERROOT)
+       -$(RMDIR) $(SERVERBIN)/driver
+       -$(RMDIR) $(SERVERBIN)/daemon
+       -$(RMDIR) $(SERVERBIN)
+       -$(RMDIR) $(SBINDIR)
+       -$(RMDIR) $(REQUESTS)/tmp
+       -$(RMDIR) $(REQUESTS)
+       -$(RMDIR) $(LOGDIR)
+       -$(RMDIR) $(CACHEDIR)
+
+
 #
 # Make the scheduler executable, "cupsd".
 #

diff --git a/scripting/php/Dependencies b/scripting/php/Dependencies
index f674ca767cbd4018a0e2cf972203a364257ee766..d17772edc4ad68015528b0c8042696f3421e1a69 100644 (file)
--- a/scripting/php/Dependencies
+++ b/scripting/php/Dependencies
@@ -1,6 +1,6 @@
 # DO NOT DELETE
 
-phpcups.o: phpcups.h ../../cups/cups.h ../../cups/ipp.h ../../cups/http.h
-phpcups.o: ../../cups/md5.h ../../cups/ppd.h ../../cups/array.h
-phpcups.o: ../../cups/file.h ../../cups/language.h ../../cups/language.h
-phpcups.o: ../../cups/string.h ../../config.h ../../cups/debug.h
+phpcups.o: ../../cups/string.h ../../config.h phpcups.h ../../cups/cups.h
+phpcups.o: ../../cups/ipp.h ../../cups/http.h ../../cups/md5.h
+phpcups.o: ../../cups/ppd.h ../../cups/array.h ../../cups/file.h
+phpcups.o: ../../cups/language.h ../../cups/language.h ../../cups/debug.h

diff --git a/scripting/php/Makefile b/scripting/php/Makefile
index 398c2714ec85b8a0afbcb839df2df0e1ec759ab5..acf6f2d2789c557359461a5455e48a07d36b3d9a 100644 (file)
--- a/scripting/php/Makefile
+++ b/scripting/php/Makefile
@@ -45,14 +45,14 @@ OBJS        =       phpcups.o
 # Targets in this directory...
 #
 
-TARGETS        =       phpcups.so
+PHPCUPS        =       phpcups.so
 
 
 #
 # Make all targets...
 #
 
-all:   $(TARGETS)
+all:   $(PHPCUPS)
 
 
 #
@@ -60,7 +60,7 @@ all:  $(TARGETS)
 #
 
 clean:
-       $(RM) $(OBJS) $(TARGETS)
+       $(RM) $(OBJS) $(PHPCUPS)
 
 
 #
@@ -76,9 +76,18 @@ depend:
 #
 
 install:       all
-       echo Installing $(TARGETS) in $(PHPDIR)
+       echo Installing $(PHPCUPS) in $(PHPDIR)
        $(INSTALL_DIR) $(PHPDIR)
-       cp $(TARGETS) $(PHPDIR)
+       $(INSTALL_BIN) $(PHPCUPS) $(PHPDIR)
+
+
+#
+# Uninstall object and target files...
+#
+
+uninstall:
+       $(RM) $(PHPDIR)/$(PHPCUPS)
+       -$(RMDIR) $(PHPDIR)
 
 
 #

diff --git a/standards/Makefile b/standards/Makefile
index 7516339364ca9dbfd6e4eaa36005d4bc4fc95218..6a21640789625449eae5b8f3fe0e057bdeda7753 100644 (file)
--- a/standards/Makefile
+++ b/standards/Makefile
@@ -100,6 +100,13 @@ depend:
 install:       all
 
 
+#
+# Uninstall files...
+#
+
+uninstall:
+
+
 #
 # rfctohtml - make html versions of RFCs...
 #

diff --git a/systemv/Makefile b/systemv/Makefile
index daf44608a5c4b0f039f651b670bc93b314074313..2fd475322f16da56de1c07872508dc0ed098a108 100644 (file)
--- a/systemv/Makefile
+++ b/systemv/Makefile
@@ -80,6 +80,29 @@ install:     all
        $(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR) || $(INSTALL_BIN) lppasswd $(BINDIR)
 
 
+#
+# Uninstall all targets...
+#
+
+uninstall:
+       $(RM) $(BINDIR)/cancel
+       $(RM) $(BINDIR)/cupstestppd
+       $(RM) $(BINDIR)/lp
+       $(RM) $(BINDIR)/lpoptions
+       $(RM) $(BINDIR)/lppasswd
+       $(RM) $(BINDIR)/lpstat
+       -$(RMDIR) $(BINDIR)
+       $(RM) $(SBINDIR)/accept
+       $(RM) $(SBINDIR)/cupsaddsmb
+       $(RM) $(SBINDIR)/cupsdisable
+       $(RM) $(SBINDIR)/cupsenable
+       $(RM) $(SBINDIR)/lpadmin
+       $(RM) $(SBINDIR)/lpinfo
+       $(RM) $(SBINDIR)/lpmove
+       $(RM) $(SBINDIR)/reject
+       -$(RMDIR) $(SBINDIR)
+
+
 #
 # accept
 #

diff --git a/templates/Makefile b/templates/Makefile
index 47aab6a261b38c7f2fecdd07421d4faa7c5f8541..e4b0fa8e7e0bf6d6c73fed3b42e33cca9fd2d567 100644 (file)
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -108,6 +108,13 @@ all:
 clean:
 
 
+#
+# Dummy depend...
+#
+
+depend:
+
+
 #
 # Install files...
 #
@@ -127,6 +134,23 @@ install: all
        done
 
 
+#
+# Uninstall files...
+#
+
+uninstall:
+       for file in $(FILES); do \
+               $(RM) $(DATADIR)/templates/$$file; \
+       done
+       for lang in $(LANGUAGES); do \
+               for file in $(FILES); do \
+                       $(RM) $(DATADIR)/templates/$$lang/$$file; \
+               done \
+               $(RMDIR) $(DATADIR)/templates/$$lang; \
+       done
+       -$(RMDIR) $(DATADIR)/templates
+
+
 #
 # End of "$Id$".
 #

diff --git a/test/Makefile b/test/Makefile
index 6e8f13bda02ff277a517003ee5417f8f9f87f3e9..87443fcfd6a59bb972a7d4a6b1c01a0c3dcf68b2 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -3,7 +3,7 @@
 #
 #   IPP test makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2005 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
@@ -55,6 +55,13 @@ depend:
 install: all
 
 
+#
+# Unnstall all targets...
+#
+
+uninstall:
+
+
 #
 # ipptest
 #