Load cups into easysw/current.

[thirdparty/cups.git] / filter / Makefile

diff --git a/filter/Makefile b/filter/Makefile
index 9aeca718d6dca7450d340aefc40954a6ca28c58b..57c8625adee13e4c7b2ad07f2852503a5c0adfb1 100644 (file)
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5311 2006-03-19 13:21:42Z mike $"
+# "$Id: Makefile 5491 2006-05-04 20:53:35Z mike $"
 #
 #   Filter makefile for the Common UNIX Printing System (CUPS).
 #
@@ -107,10 +107,8 @@ install:   all installhdrs $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
 
 installstatic:
        $(INSTALL_DIR) -m 755 $(LIBDIR)
-       -if test $(LIBCUPSIMAGE) != "libcupsimage.a"; then \
-               $(INSTALL_LIB) libcupsimage.a $(LIBDIR); \
-               $(RANLIB) $(LIBDIR)/libcupsimage.a; \
-       fi
+       $(INSTALL_LIB) libcupsimage.a $(LIBDIR);
+       $(RANLIB) $(LIBDIR)/libcupsimage.a;
 
 installhdrs:
        $(INSTALL_DIR) -m 755 $(INCLUDEDIR)/cups
@@ -207,7 +205,8 @@ hpgltops:   $(HPGLOBJS) common.o ../cups/$(LIBCUPS)
 
 libcupsimage.so.2 libcupsimage.sl.2:   $(IMAGEOBJS)
        echo Linking $@...
-       $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm
+       $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) \
+               -L../cups $(LINKCUPS) -lm
        $(RM) `basename $@ .2`
        $(LN) $@ `basename $@ .2`
 
@@ -218,7 +217,8 @@ libcupsimage.so.2 libcupsimage.sl.2:        $(IMAGEOBJS)
 
 libcupsimage.32.so.2:  $(IMAGE32OBJS)
        echo Linking 32-bit $@...
-       $(DSO) $(ARCH32FLAGS) $(DSOFLAGS) -o $@ $(IMAGE32OBJS) $(DSOLIBS) -lm
+       $(DSO) $(ARCH32FLAGS) $(DSOFLAGS) -o $@ $(IMAGE32OBJS) $(DSOLIBS) \
+               -L../cups $(LINKCUPS) -lm
 
 
 #
@@ -227,7 +227,8 @@ libcupsimage.32.so.2:       $(IMAGE32OBJS)
 
 libcupsimage.64.so.2:  $(IMAGE64OBJS)
        echo Linking 64-bit $@...
-       $(DSO) $(ARCH64FLAGS) $(DSOFLAGS) -o $@ $(IMAGE64OBJS) $(DSOLIBS) -lm
+       $(DSO) $(ARCH64FLAGS) $(DSOFLAGS) -o $@ $(IMAGE64OBJS) $(DSOLIBS) \
+               -L../cups $(LINKCUPS) -lm
 
 
 #
@@ -249,7 +250,7 @@ libcupsimage.2.dylib:       $(IMAGEOBJS)
 # libcupsimage_s.a
 #
 
-libcupsimage_s.a:      $(IMAGEOBJS)
+libcupsimage_s.a:      $(IMAGEOBJS) libcupsimage_s.exp
        echo Linking $@...
        $(DSO) $(DSOFLAGS) -Wl,-berok,-bexport:libcupsimage_s.exp \
                -o libcupsimage_s.o $(IMAGEOBJS) $(DSOLIBS) -lm
@@ -264,6 +265,7 @@ libcupsimage_s.a:   $(IMAGEOBJS)
 libcupsimage.la:       $(IMAGEOBJS)
        echo Linking $@...
        $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \
+               -L../cups $(LINKCUPS) \
                -rpath $(LIBDIR) -version-info 2:2
 
 
@@ -373,5 +375,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 5311 2006-03-19 13:21:42Z mike $".
+# End of "$Id: Makefile 5491 2006-05-04 20:53:35Z mike $".
 #