X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=blobdiff_plain;f=Makefile;h=45dd92c05ab176eba045689cb561588501c40697;hp=2913b9831634570d51459b65041e4f2389791dac;hb=411affcf6ae840dbe82786a1f42c16cb3127d20f;hpb=757d2cad8f3f75c420ad2e462b787cd9cf8a7a62 diff --git a/Makefile b/Makefile index 2913b9831..45dd92c05 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $" +# "$Id: Makefile 5902 2006-08-29 15:51:19Z mike $" # # Top-level Makefile for the Common UNIX Printing System (CUPS). # @@ -29,7 +29,7 @@ include Makedefs # DIRS = cups backend berkeley cgi-bin filter locale man monitor \ - notifier pdftops scheduler systemv test \ + notifier $(PDFTOPS) scheduler systemv test \ $(PHPDIR) \ conf data doc fonts ppd templates @@ -57,6 +57,25 @@ clean: done +# +# Remove all non-distribution files... +# + +distclean: clean + $(RM) Makedefs config.h config.log config.status + $(RM) cups-config conf/cupsd.conf conf/pam.std + $(RM) doc/help/standard.html doc/index.html + $(RM) init/cups.sh init/cups-lpd + $(RM) man/cups-deviced.man man/cups-driverd.man + $(RM) man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man + $(RM) man/cupsd.conf.man man/lpoptions.man + $(RM) packaging/cups templates/edit-config.tmpl templates/header.tmpl + -$(RM) doc/*/index.html + -$(RM) templates/*/edit-config.tmpl + -$(RM) templates/*/header.tmpl + -$(RM) -r autom4te*.cache + + # # Make dependencies # @@ -80,8 +99,8 @@ install: installhdrs echo Installing cups-config script... $(INSTALL_DIR) -m 755 $(BINDIR) $(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config - echo Installing startup script... - if test "x$(INITDIR)" != "x"; then \ + if test "x$(INITDIR)" != x; then \ + echo Installing init scripts...; \ $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \ $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \ $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \ @@ -93,24 +112,46 @@ install: installhdrs $(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 \ + if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \ $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \ if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \ + echo Installing StartupItems files...; \ $(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \ $(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \ $(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 \ + echo Installing LaunchDaemons configuration files...; \ $(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \ + $(INSTALL_DATA) init/org.cups.cups-lpd.plist $(BUILDROOT)/System/Library/LaunchDaemons; \ else \ + echo Installing RC script...; \ $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \ fi \ fi - if test "x$(DBUSDIR)" != "x"; then \ + if test "x$(DBUSDIR)" != x; then \ echo Installing cups.conf in $(DBUSDIR)...;\ $(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR); \ $(INSTALL_DATA) packaging/cups-dbus.conf $(BUILDROOT)$(DBUSDIR)/cups.conf; \ fi + if test "x$(XINETD)" != x; then \ + echo Installing xinetd configuration file for cups-lpd...; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \ + $(INSTALL_DATA) init/cups-lpd $(BUILDROOT)$(XINETD)/cups-lpd; \ + fi + if test -d /usr/share/applications; then \ + echo Installing desktop icons...; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/applications; \ + $(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)/usr/share/applications; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps; \ + $(INSTALL_DATA) desktop/cups-16.png $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps/cups.png; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps; \ + $(INSTALL_DATA) desktop/cups-32.png $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps/cups.png; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps; \ + $(INSTALL_DATA) desktop/cups-64.png $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps/cups.png; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps; \ + $(INSTALL_DATA) desktop/cups-128.png $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps/cups.png; \ + fi # @@ -138,7 +179,7 @@ uninstall: $(RM) $(BINDIR)/cups-config -$(RMDIR) $(BINDIR) echo Uninstalling startup script... - if test "x$(INITDIR)" != "x"; then \ + if test "x$(INITDIR)" != x; then \ $(RM) $(BUILDROOT)$(INITDIR)/init.d/cups; \ $(RMDIR) $(BUILDROOT)$(INITDIR)/init.d; \ $(RM) $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \ @@ -150,7 +191,7 @@ uninstall: $(RM) $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \ $(RMDIR) $(BUILDROOT)$(INITDIR)/rc5.d; \ fi - if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \ + 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; \ @@ -163,35 +204,61 @@ uninstall: fi \ $(RMDIR) $(BUILDROOT)$(INITDDIR); \ fi - if test "x$(DBUSDIR)" != "x"; then \ + if test "x$(DBUSDIR)" != x; then \ echo Uninstalling cups.conf in $(DBUSDIR)...;\ $(RM) $(BUILDROOT)$(DBUSDIR)/cups.conf; \ $(RMDIR) $(BUILDROOT)$(DBUSDIR); \ fi + $(RM) $(BUILDROOT)/etc/xinetd.d/cups-lpd + $(RM) $(BUILDROOT)/usr/share/applications/cups.desktop + $(RM) $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps/cups.png + $(RM) $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps/cups.png + $(RM) $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps/cups.png + $(RM) $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps/cups.png # # Run the test suite... # -check test: all +test: all echo Running CUPS test suite... cd test; ./run-stp-tests.sh +check: all + echo Running CUPS test suite with defaults... + cd test; ./run-stp-tests.sh 1 0 n + + # # Make software distributions using EPM (http://www.easysw.com/epm/)... # -EPMFLAGS = -v +EPMFLAGS = -v --output-dir dist $(EPMARCH) -aix bsd deb depot inst osx pkg rpm setld slackware swinstall tardist: +aix bsd deb depot inst pkg rpm setld slackware swinstall tardist: epm $(EPMFLAGS) -f $@ cups packaging/cups.list epm: - epm $(EPMFLAGS) cups packaging/cups.list + epm $(EPMFLAGS) -s packaging/installer.gif cups packaging/cups.list + +osx: + epm $(EPMFLAGS) -f osx -s packaging/installer.tif cups packaging/cups.list + +.PHONEY: dist +dist: all + $(RM) -r dist + $(MAKE) $(MFLAGS) epm + case `uname` in \ + *BSD*) $(MAKE) $(MFLAGS) bsd;; \ + Darwin*) $(MAKE) $(MFLAGS) osx;; \ + IRIX*) $(MAKE) $(MFLAGS) tardist;; \ + Linux*) $(MAKE) $(MFLAGS) rpm;; \ + SunOS*) $(MAKE) $(MFLAGS) pkg;; \ + esac # -# End of "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $". +# End of "$Id: Makefile 5902 2006-08-29 15:51:19Z mike $". #