Makefile changes - all LN commands are preceded by an RM command to

avoid warnings.

The CUPS configure script tried to detect GCC and Linux; changed back
to just GCC.

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

diff --git a/backend/Makefile b/backend/Makefile
index ec38c19e78e3dbfa5ee364a7191410333bb03550..72637fd80f5778be4e6a3ac9ef9aa3766f2cddbf 100644 (file)
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.17 2000/02/28 19:21:40 mike Exp $"
+# "$Id: Makefile,v 1.18 2000/02/29 14:47:27 mike Exp $"
 #
 #   Backend makefile for the Common UNIX Printing System (CUPS).
 #
@@ -51,7 +51,8 @@ clean:
 install:
        -$(MKDIR) $(SERVERBIN)/backend
        $(CP) $(BACKENDS) $(SERVERBIN)/backend
-       -$(LN) ipp $(SERVERBIN)/backend/http
+       $(RM) $(SERVERBIN)/backend/http
+       $(LN) ipp $(SERVERBIN)/backend/http
 
 
 #
@@ -72,7 +73,8 @@ betest.o:     ../cups/string.h ../Makedefs
 ipp:   ipp.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(CC) $(LDFLAGS) -o ipp ipp.o $(LIBS)
-       -$(LN) ipp http
+       $(RM) http
+       $(LN) ipp http
 
 ipp.o: ../cups/cups.h ../Makedefs
 
@@ -133,5 +135,5 @@ usb.o:      ../cups/cups.h ../Makedefs
 
 
 #
-# End of "$Id: Makefile,v 1.17 2000/02/28 19:21:40 mike Exp $".
+# End of "$Id: Makefile,v 1.18 2000/02/29 14:47:27 mike Exp $".
 #

diff --git a/configure.in b/configure.in
index 6c86f36924c4f76efaba69b3af2874065b6fa544..cba1e07a6ca8f4fd32bc6b52e61a111e3f8a4a87 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: configure.in,v 1.31 2000/02/28 21:21:28 mike Exp $"
+dnl "$Id: configure.in,v 1.32 2000/02/29 14:47:27 mike Exp $"
 dnl
 dnl   Configuration script for the Common UNIX Printing System (CUPS).
 dnl
@@ -200,7 +200,7 @@ AC_CHECK_FUNCS(waitpid)
 AC_CHECK_FUNCS(wait3)
 
 dnl Update compiler options...
-if test -n "$GXX" -o $uname = Linux; then
+if test -n "$GXX"; then
        if test -z "$OPTIM"; then
                OPTIM="-O2 -g3"
        fi
@@ -346,5 +346,5 @@ AC_SUBST(CUPS_DOCDIR)
 AC_OUTPUT(Makedefs)
 
 dnl
-dnl End of "$Id: configure.in,v 1.31 2000/02/28 21:21:28 mike Exp $".
+dnl End of "$Id: configure.in,v 1.32 2000/02/29 14:47:27 mike Exp $".
 dnl

diff --git a/cups/Makefile b/cups/Makefile
index 82567bd47398ddd10186a8287b2a9c6ffb8ed349..f3905f435b6414631e72fc90cfdde87179a37db0 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.31 2000/02/25 03:00:52 mike Exp $"
+# "$Id: Makefile,v 1.32 2000/02/29 14:47:28 mike Exp $"
 #
 #   Support library Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -78,7 +78,8 @@ install:      all
 libcups.so.2 libcups.sl.2:     $(LIBOBJS) ../Makedefs
        echo Linking $@...
        $(DSO) $@ $(LIBOBJS)
-       -$(LN) $@ `basename $@ .2`
+       $(RM) `basename $@ .2`
+       $(LN) $@ `basename $@ .2`
 
 #
 # libcups.a
@@ -137,5 +138,5 @@ testppd.o:  ppd.h
 $(OBJS):       ../Makedefs ../config.h
 
 #
-# End of "$Id: Makefile,v 1.31 2000/02/25 03:00:52 mike Exp $".
+# End of "$Id: Makefile,v 1.32 2000/02/29 14:47:28 mike Exp $".
 #

diff --git a/doc/Makefile b/doc/Makefile
index 554b8d74aa995eef65e1db08470e78f3a2af4082..ac4284cb9ebea1f4b0f6e936f0e9ad1d793c5d9f 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.16 2000/02/08 20:38:48 mike Exp $"
+# "$Id: Makefile,v 1.17 2000/02/29 14:47:28 mike Exp $"
 #
 #   Documentation makefile for the Common UNIX Printing System (CUPS).
 #
@@ -101,14 +101,14 @@ clean:
 #
 
 install:
-       -$(MKDIR) $(DOCDIR)/doc
-       $(CP) $(WEBPAGES) $(DOCDIR)/doc
-       $(CP) overview.html overview.pdf $(DOCDIR)/doc
-       $(CP) $(DOCUMENTS:.shtml=.html) $(DOCDIR)/doc
-       $(CP) $(DOCUMENTS:.shtml=.pdf) $(DOCDIR)/doc
-       -$(MKDIR) $(DOCDIR)/doc/images
-       $(CP) $(WEBIMAGES) $(DOCDIR)/doc/images
-       $(CP) $(DOCIMAGES) $(DOCDIR)/doc/images
+       -$(MKDIR) $(DOCDIR)
+       $(CP) $(WEBPAGES) $(DOCDIR)
+       $(CP) overview.html overview.pdf $(DOCDIR)
+       $(CP) $(DOCUMENTS:.shtml=.html) $(DOCDIR)
+       $(CP) $(DOCUMENTS:.shtml=.pdf) $(DOCDIR)
+       -$(MKDIR) $(DOCDIR)/images
+       $(CP) $(WEBIMAGES) $(DOCDIR)/images
+       $(CP) $(DOCIMAGES) $(DOCDIR)/images
 
 #
 # The overview, admin manual, programmers manual, and users manual get

diff --git a/filter/Makefile b/filter/Makefile
index 6bae8481b5e2fdb803ad8812a44d55955314f0af..73187351d2dfc1de31919c983796b1c1dc93fa69 100644 (file)
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.26 2000/02/28 21:45:59 mike Exp $"
+# "$Id: Makefile,v 1.27 2000/02/29 14:47:29 mike Exp $"
 #
 #   Filter makefile for the Common UNIX Printing System (CUPS).
 #
@@ -97,7 +97,8 @@ $(HPGLOBJS):  hpgltops.h
 libcupsimage.so.2 libcupsimage.sl.2:   $(IMAGEOBJS) raster.o ../Makedefs
        echo Linking $@...
        $(DSO) $@ $(IMAGEOBJS) raster.o $(DSOLIBS) -lm
-       -$(LN) $@ `basename $@ .2`
+       $(RM) `basename $@ .2`
+       $(LN) $@ `basename $@ .2`
 
 
 #
@@ -186,5 +187,5 @@ $(OBJS):    ../Makedefs ../cups/cups.h ../cups/ppd.h ../cups/language.h
 
 
 #
-# End of "$Id: Makefile,v 1.26 2000/02/28 21:45:59 mike Exp $".
+# End of "$Id: Makefile,v 1.27 2000/02/29 14:47:29 mike Exp $".
 #

diff --git a/man/Makefile b/man/Makefile
index dbf9e26db6298397bf23a1ebd2675f9fb855a747..2af7cd7d410e00c1e8c9da4977253498ef368717 100644 (file)
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.6 2000/02/22 20:45:14 mike Exp $"
+# "$Id: Makefile,v 1.7 2000/02/29 14:47:29 mike Exp $"
 #
 #   Man page makefile for the Common UNIX Printing System (CUPS).
 #
@@ -33,9 +33,9 @@ CAT5  =       classes.conf.5 cupsd.conf.5 mime.convs.5 mime.types.5 \
                printers.conf.5
 CAT8   =       accept.8 cupsd.8 enable.8 lpadmin.8 lpc.8
 
-MAN1   =       $(MAN1:.1=.man)
-MAN5   =       $(MAN5:.5=.man)
-MAN8   =       $(MAN8:.8=.man)
+MAN1   =       $(CAT1:.1=.man)
+MAN5   =       $(CAT5:.5=.man)
+MAN8   =       $(CAT8:.8=.man)
 
 
 #
@@ -61,9 +61,11 @@ install:
        for file in $(MAN1); do \
                $(CP) $$file $(MANDIR)/man1/`basename $$file man`1; \
        done
+       $(RM) $(MANDIR)/man1/cancel.1
        $(LN) lp.1 $(MANDIR)/man1/cancel.1
        -$(MKDIR) $(MANDIR)/cat1
        $(CP) $(CAT1) $(MANDIR)/cat1
+       $(RM) $(MANDIR)/cat1/cancel.1
        $(LN) lp.1 $(MANDIR)/cat1/cancel.1
        -$(MKDIR) $(MANDIR)/man5
        for file in $(MAN5); do \
@@ -75,13 +77,17 @@ install:
        for file in $(MAN8); do \
                $(CP) $$file $(MANDIR)/man8/`basename $$file man`8; \
        done
+       $(RM) $(MANDIR)/man8/reject.8
        $(LN) accept.8 $(MANDIR)/man8/reject.8
+       $(RM) $(MANDIR)/man8/disable.8
        $(LN) enable.8 $(MANDIR)/man8/disable.8
        -$(MKDIR) $(MANDIR)/cat8
        $(CP) $(CAT8) $(MANDIR)/cat8
+       $(RM) $(MANDIR)/cat8/reject.8
        $(LN) accept.8 $(MANDIR)/cat8/reject.8
+       $(RM) $(MANDIR)/cat8/disable.8
        $(LN) enable.8 $(MANDIR)/cat8/disable.8
 
 #
-# End of "$Id: Makefile,v 1.6 2000/02/22 20:45:14 mike Exp $".
+# End of "$Id: Makefile,v 1.7 2000/02/29 14:47:29 mike Exp $".
 #

diff --git a/pstoraster/Makefile b/pstoraster/Makefile
index 0504fbfb9e6c5acdf41d00df67c0adb396c46713..883df80a7d68f30f00fcf5893ee2377b9ff99a4b 100644 (file)
--- a/pstoraster/Makefile
+++ b/pstoraster/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.16 2000/02/08 20:38:58 mike Exp $"
+# "$Id: Makefile,v 1.17 2000/02/29 14:47:30 mike Exp $"
 #
 #   GNU Ghostscript makefile for the Common UNIX Printing System (CUPS).
 #
@@ -122,7 +122,8 @@ clean:
 install:       $(TARGETS)
        -$(MKDIR) $(SERVERBIN)/filter
        $(CP) pstoraster $(SERVERBIN)/filter
-       -$(LN) pstoraster $(SERVERBIN)/filter/pdftops
+       $(RM) $(SERVERBIN)/filter/pdftops
+       $(LN) pstoraster $(SERVERBIN)/filter/pdftops
        -$(MKDIR) $(DATADIR)/pstoraster
        $(CP) $(DFILES) $(DATADIR)/pstoraster
 
@@ -163,5 +164,5 @@ pstoraster: pstoraster.o libgs.a ../Makedefs ../cups/$(LIBCUPS)
 pstoraster.o:  arch.h ../config.h ../Makedefs
 
 #
-# End of "$Id: Makefile,v 1.16 2000/02/08 20:38:58 mike Exp $".
+# End of "$Id: Makefile,v 1.17 2000/02/29 14:47:30 mike Exp $".
 #