Update build system to support only building libraries for "install-libs".

Build automated test programs with ARCHFLAGS, not just LDARCHFLAGS.

Fix a _ppdLocalizeAttr bug - need to use %2.2s, not %2s for non-country-
specific locale string.

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

diff --git a/Makefile b/Makefile
index d5631a89258db15c276b2bb7c5dad471fa078c62..3855d4cf01e184a12223fa764c4f42cfb233172f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,13 +31,32 @@ DIRS        =       cups filter backend berkeley cgi-bin driver locale man monitor \
 
 all:
        chmod +x cups-config
+       echo Using ARCHFLAGS="$(ARCHFLAGS)"
        echo Using ALL_CFLAGS="$(ALL_CFLAGS)"
        echo Using ALL_CXXFLAGS="$(ALL_CXXFLAGS)"
+       echo Using DSOFLAGS="$(DSOFLAGS)"
        echo Using LDFLAGS="$(LDFLAGS)"
        echo Using LIBS="$(LIBS)"
        for dir in $(DIRS); do\
                echo Making all in $$dir... ;\
-               (cd $$dir ; $(MAKE) $(MFLAGS)) || exit 1;\
+               (cd $$dir ; $(MAKE) $(MFLAGS) all) || exit 1;\
+       done
+
+
+#
+# Make library targets...
+#
+
+libs:
+       echo Using ARCHFLAGS="$(ARCHFLAGS)"
+       echo Using ALL_CFLAGS="$(ALL_CFLAGS)"
+       echo Using ALL_CXXFLAGS="$(ALL_CXXFLAGS)"
+       echo Using DSOFLAGS="$(DSOFLAGS)"
+       echo Using LDFLAGS="$(LDFLAGS)"
+       echo Using LIBS="$(LIBS)"
+       for dir in $(DIRS); do\
+               echo Making all in $$dir... ;\
+               (cd $$dir ; $(MAKE) $(MFLAGS) libs) || exit 1;\
        done
 
 
@@ -189,10 +208,10 @@ install-headers:
 # Install programs...
 #
 
-install-exec:
+install-exec:  all
        for dir in $(DIRS); do\
                echo Installing programs in $$dir... ;\
-               (cd $$dir; $(MAKE) $(MFLAGS) all install-exec) || exit 1;\
+               (cd $$dir; $(MAKE) $(MFLAGS) install-exec) || exit 1;\
        done
 
 
@@ -200,10 +219,10 @@ install-exec:
 # Install libraries...
 #
 
-install-libs:
+install-libs:  libs
        for dir in $(DIRS); do\
                echo Installing libraries in $$dir... ;\
-               (cd $$dir; $(MAKE) $(MFLAGS) all install-libs) || exit 1;\
+               (cd $$dir; $(MAKE) $(MFLAGS) install-libs) || exit 1;\
        done
 
 

diff --git a/backend/Makefile b/backend/Makefile
index a87c5fa3ca02f619acc4a8005a7c8e9844b44442..ae16b53d76eda200b5891a75930e5084031a52dd 100644 (file)
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -33,6 +33,13 @@ OBJS =       ipp.o lpd.o mdns.o pap.o parallel.o scsi.o serial.o snmp.o \
 all:   $(TARGETS)
 
 
+#
+# Make library targets...
+#
+
+libs:
+
+
 #
 # Clean all object files...
 #

diff --git a/berkeley/Makefile b/berkeley/Makefile
index 7afa726b5c56489c190e9f4d6676420cdca403a5..479053b330114218533693f3601aa9a30c3ac203 100644 (file)
--- a/berkeley/Makefile
+++ b/berkeley/Makefile
@@ -26,6 +26,13 @@ OBJS =       lpc.o lpq.o lpr.o lprm.o
 all:   $(TARGETS)
 
 
+#
+# Make library targets...
+#
+
+libs:
+
+
 #
 # Clean all object files...
 #

diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index f3167b3919287cc9e3f2b39aa49ed3ef0a904406..cff3566224303cb68478a067a00b049e50ddcf27 100644 (file)
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -42,14 +42,17 @@ CGIS        =       \
                help.cgi \
                jobs.cgi \
                printers.cgi
-TARGETS        =       \
+LIBTARGETS =   \
                libcupscgi.a \
                $(LIBCUPSCGI) \
                $(LIB32CUPSCGI) \
                $(LIB32CUPSCGI) \
-               $(CGIS) \
                testcgi \
-               testhi \
+               testhi
+
+TARGETS        =       \
+               $(LIBTARGETS) \
+               $(CGIS) \
                testtemplate
 
 
@@ -60,6 +63,13 @@ TARGETS      =       \
 all:   $(TARGETS)
 
 
+#
+# Make library targets...
+#
+
+libs:          $(LIBTARGETS)
+
+
 #
 # Clean all object files...
 #
@@ -352,8 +362,10 @@ printers.cgi:      printers.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 
 testcgi:       testcgi.o ../Makedefs libcupscgi.a ../cups/libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testcgi.o libcupscgi.a ../cups/libcups.a \
-               $(COMMONLIBS) $(SSLLIBS) $(LIBZ) $(LIBGSSAPI)
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcgi.o libcupscgi.a \
+               ../cups/libcups.a $(COMMONLIBS) $(SSLLIBS) $(LIBZ) $(LIBGSSAPI)
+       echo Testing CGI API...
+       ./testcgi
 
 
 #
@@ -362,8 +374,10 @@ testcgi:   testcgi.o ../Makedefs libcupscgi.a ../cups/libcups.a
 
 testhi:        testhi.o ../Makedefs libcupscgi.a ../cups/libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testhi.o libcupscgi.a ../cups/libcups.a \
-               $(COMMONLIBS) $(SSLLIBS) $(LIBZ) $(LIBGSSAPI)
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhi.o libcupscgi.a \
+               ../cups/libcups.a $(COMMONLIBS) $(SSLLIBS) $(LIBZ) $(LIBGSSAPI)
+       echo Testing help index API...
+       ./testhi
 
 
 #

diff --git a/conf/Makefile b/conf/Makefile
index 361a3812bc21ac85fdca1b281b2a055d249a47c8..2aa0c0b786512062ab1d5b6771b65d2abc3b715c 100644 (file)
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -30,6 +30,13 @@ REPLACE      =       mime.convs mime.types
 all:
 
 
+#
+# Make library targets...
+#
+
+libs:
+
+
 #
 # Clean all config and object files...
 #

diff --git a/cups/Makefile b/cups/Makefile
index a6b8bff145733d11725f48f7d8c97212ddca6ba4..cb46537ae35c599c97aba83bf38b960d16c567d9 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -108,20 +108,23 @@ HEADERS   =       \
 # Targets in this directory...
 #
 
-TARGETS        =       \
+LIBTARGETS =   \
                $(LIBCUPS) \
                $(LIB32CUPS) \
                $(LIB64CUPS) \
                libcups.a \
-               testadmin \
                testarray \
-               testcups \
                testfile \
                testhttp \
                testi18n \
                testipp \
                testlang \
-               testppd \
+               testppd
+
+TARGETS        =       \
+               $(LIBTARGETS) \
+               testadmin \
+               testcups \
                testsnmp
 
 
@@ -132,6 +135,13 @@ TARGETS    =       \
 all:   $(TARGETS)
 
 
+#
+# Make library targets...
+#
+
+libs:          $(LIBTARGETS)
+
+
 #
 # Remove object and target files...
 #
@@ -382,8 +392,10 @@ testadmin: testadmin.o libcups.a
 
 testarray:     testarray.o libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testarray.o libcups.a \
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testarray.o libcups.a \
                $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+       echo Running array API tests...
+       ./testarray
 
 
 #
@@ -402,8 +414,10 @@ testcups:  testcups.o libcups.a
 
 testfile:      testfile.o libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testfile.o libcups.a \
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testfile.o libcups.a \
                $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+       echo Running file API tests...
+       ./testfile
 
 
 #
@@ -412,8 +426,10 @@ testfile:  testfile.o libcups.a
 
 testhttp:      testhttp.o libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testhttp.o libcups.a \
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhttp.o libcups.a \
                $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+       echo Running HTTP API tests...
+       ./testhttp
 
 
 #
@@ -422,8 +438,10 @@ testhttp:  testhttp.o libcups.a
 
 testipp:       testipp.o libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testipp.o libcups.a \
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testipp.o libcups.a \
                $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+       echo Running IPP API tests...
+       ./testipp
 
 
 #
@@ -432,8 +450,10 @@ testipp:   testipp.o libcups.a
 
 testi18n:      testi18n.o libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testi18n.o libcups.a \
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testi18n.o libcups.a \
                $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+       echo Running internationalization API tests...
+       ./testi18n || echo I18N test failed!
 
 
 #
@@ -442,8 +462,10 @@ testi18n:  testi18n.o libcups.a
 
 testlang:      testlang.o libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testlang.o libcups.a \
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testlang.o libcups.a \
                $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+       echo Running language API tests...
+       ./testlang
 
 
 #
@@ -452,8 +474,10 @@ testlang:  testlang.o libcups.a
 
 testppd:       testppd.o libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testppd.o libcups.a \
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testppd.o libcups.a \
                $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+       echo Running PPD API tests...
+       ./testppd
 
 
 #

diff --git a/cups/language.c b/cups/language.c
index d6974faa7a30f87dabafad3247575136dd9cb051..924f2eb1253bf8cfdf732aad267f0737513b5d6a 100644 (file)
--- a/cups/language.c
+++ b/cups/language.c
@@ -441,8 +441,13 @@ cupsLangGet(const char *language)  /* I - Language or locale */
   * preference so we have to look it up this way...
   */
 
-  if (!language && (language = getenv("LANG")) == NULL)
-    language = appleLangDefault();
+  if (!language)
+  {
+    if ((language = getenv("LANG")) == NULL)
+      language = appleLangDefault();
+
+    DEBUG_printf(("cupsLangGet: language=\"%s\"\n", language));
+  }
 
 #else
  /*
@@ -705,6 +710,8 @@ cupsLangGet(const char *language)   /* I - Language or locale */
     pthread_mutex_unlock(&lang_mutex);
 #endif /* HAVE_PTHREAD_H */
 
+    DEBUG_printf(("cupsLangGet: Using cached copy of \"%s\"...\n", real));
+
     return (lang);
   }
 
@@ -892,14 +899,21 @@ _cupsMessageLoad(const char *filename)    /* I - Message catalog to load */
   */
 
   if ((a = cupsArrayNew((cups_array_func_t)cups_message_compare, NULL)) == NULL)
+  {
+    DEBUG_puts("_cupsMessageLoad: Unable to allocate array!");
     return (NULL);
+  }
 
  /*
   * Open the message catalog file...
   */
 
   if ((fp = cupsFileOpen(filename, "r")) == NULL)
+  {
+    DEBUG_printf(("_cupsMessageLoad: Unable to open file: %s\n",
+                  strerror(errno)));
     return (a);
+  }
 
  /*
   * Read messages from the catalog file until EOF...
@@ -1050,6 +1064,9 @@ _cupsMessageLoad(const char *filename)    /* I - Message catalog to load */
 
   cupsFileClose(fp);
 
+  DEBUG_printf(("_cupsMessageLoad: Returning %d messages...\n",
+                cupsArrayCount(a)));
+
   return (a);
 }
 

diff --git a/cups/localize.c b/cups/localize.c
index 338049b14fd00a252f012b86f6ce067f853e20b7..647c9b781cb7dbd0f816a31562d640a0a07f7bc6 100644 (file)
--- a/cups/localize.c
+++ b/cups/localize.c
@@ -574,7 +574,7 @@ _ppdLocalizedAttr(ppd_file_t *ppd,  /* I - PPD file */
   snprintf(lkeyword, sizeof(lkeyword), "%s.%s", ll_CC, keyword);
   if ((attr = ppdFindAttr(ppd, lkeyword, spec)) == NULL)
   {
-    snprintf(lkeyword, sizeof(lkeyword), "%2s.%s", ll_CC, keyword);
+    snprintf(lkeyword, sizeof(lkeyword), "%2.2s.%s", ll_CC, keyword);
     attr = ppdFindAttr(ppd, lkeyword, spec);
 
     if (!attr)

diff --git a/cups/testppd.c b/cups/testppd.c
index 8bb5e05245ac8d7e990d4f35814a574fc2680c58..0309cb605200ca7f4597e5b404056f7e86250e2a 100644 (file)
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <cups/string.h>
+#include <sys/stat.h>
 #include <errno.h>
 #include "ppd.h"
 #ifdef WIN32
@@ -106,6 +107,25 @@ main(int  argc,                            /* I - Number of command-line arguments */
 
   if (argc == 1)
   {
+   /*
+    * Setup directories for locale stuff...
+    */
+
+    if (access("locale", 0))
+    {
+      mkdir("locale", 0777);
+      mkdir("locale/fr", 0777);
+      symlink("../../../locale/cups_fr.po", "locale/fr/cups_fr.po");
+      mkdir("locale/zh_TW", 0777);
+      symlink("../../../locale/cups_zh_TW.po", "locale/zh_TW/cups_zh_TW.po");
+    }
+
+    putenv("LOCALEDIR=locale");
+
+   /*
+    * Do tests with test.ppd...
+    */
+
     fputs("ppdOpenFile: ", stdout);
 
     if ((ppd = ppdOpenFile("test.ppd")) != NULL)

diff --git a/data/Makefile b/data/Makefile
index 3f31d8213c249ab24c1eeb7fbddb273fcaa40bdb..8cd2e3201af189a131ef67ff2772bda3c42c3d86 100644 (file)
--- a/data/Makefile
+++ b/data/Makefile
@@ -92,6 +92,13 @@ PPDCFILES =  \
 all:
 
 
+#
+# Make library targets...
+#
+
+libs:
+
+
 #
 # Clean all config and object files...
 #

diff --git a/doc/Makefile b/doc/Makefile
index 710f9f731133ea3a27f78e15c168f436cc1434c0..617f945d78c3024baed95a39e725632ab3051391 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -125,6 +125,13 @@ HELPFILES  =       \
 all:
 
 
+#
+# Make library targets...
+#
+
+libs:
+
+
 #
 # Remove all generated files...
 #

diff --git a/driver/Makefile b/driver/Makefile
index f94ec6fc126a1ffe8ebfb50003a0c0cc025a8be7..accaacc13548e8753fe3109cc8f60d777e0065ce 100644 (file)
--- a/driver/Makefile
+++ b/driver/Makefile
@@ -49,18 +49,20 @@ OBJS                = \
                $(LIB32OBJS) \
                $(LIB64OBJS)
 
-TARGETS                = \
+LIBTARGETS =   \
                $(LIBCUPSDRIVER) \
                $(LIB32CUPSDRIVER) \
                $(LIB64CUPSDRIVER) \
                libcupsdriver.a \
-               commandtoescpx \
-               commandtopclx \
-               rastertoescpx \
-               rastertopclx \
                testcmyk \
                testdither \
                testrgb
+TARGETS =      \
+               $(LIBTARGETS) \
+               commandtoescpx \
+               commandtopclx \
+               rastertoescpx \
+               rastertopclx
 
 
 #
@@ -70,6 +72,13 @@ TARGETS              = \
 all:           $(TARGETS)
 
 
+#
+# Make library targets...
+#
+
+libs:          $(LIBTARGETS)
+
+
 #
 # Clean everything...
 #
@@ -273,12 +282,13 @@ rastertopclx:             rastertopclx.o pcl-common.o $(LIBCUPSDRIVER) \
 
 testcmyk:              testcmyk.o libcupsdriver.a ../cups/libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testcmyk.o libcupsdriver.a ../cups/libcups.a \
-               $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcmyk.o libcupsdriver.a \
+               ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
        if test ! -d test; then \
                mkdir test; \
        fi
-       ./testcmyk > test/testcmyk.log 2>&1 || echo "CMYK tests failed!"
+       echo Running CMYK API tests...
+       ./testcmyk > test/testcmyk.log
 
 
 #
@@ -287,19 +297,20 @@ testcmyk:         testcmyk.o libcupsdriver.a ../cups/libcups.a
 
 testdither:            testdither.o libcupsdriver.a ../cups/libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testdither.o libcupsdriver.a ../cups/libcups.a \
-               $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testdither.o libcupsdriver.a \
+               ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
        if test ! -d test; then \
                mkdir test; \
        fi
-       ./testdither > test/0-255.pgm 2>test/0-255.log || echo "Dither 0-255 test failed!"
-       ./testdither 0 127 255 > test/0-127-255.pgm 2>test/0-127-255.log || echo "Dither 0-127-255 test failed!"
-       ./testdither 0 85 170 255 > test/0-85-170-255.pgm 2>test/0-85-170-255.log || echo "Dither 0-85-170-255 test failed!"
-       ./testdither 0 63 127 170 198 227 255 > test/0-63-127-170-198-227-255.pgm 2>test/0-63-127-170-198-227-255.log || echo "Dither 0-63-127-170-198-227-255 test failed!"
-       ./testdither 0 210 383 > test/0-210-383.pgm 2>test/0-210-383.log || echo "Dither 0-210-383 test failed!"
-       ./testdither 0 82 255 > test/0-82-255.pgm 2>test/0-82-255.log || echo "Dither 0-82-255 test failed!"
-       ./testdither 0 510 > test/0-510.pgm 2>test/0-510.log || echo "Dither 0-510 test failed!"
-       ./testdither 0 1020 > test/0-1020.pgm 2>test/0-1020.log || echo "Dither 0-1020 test failed!"
+       echo Running dither API tests...
+       ./testdither > test/0-255.pgm 2>test/0-255.log
+       ./testdither 0 127 255 > test/0-127-255.pgm 2>test/0-127-255.log
+       ./testdither 0 85 170 255 > test/0-85-170-255.pgm 2>test/0-85-170-255.log
+       ./testdither 0 63 127 170 198 227 255 > test/0-63-127-170-198-227-255.pgm 2>test/0-63-127-170-198-227-255.log
+       ./testdither 0 210 383 > test/0-210-383.pgm 2>test/0-210-383.log
+       ./testdither 0 82 255 > test/0-82-255.pgm 2>test/0-82-255.log
+       ./testdither 0 510 > test/0-510.pgm 2>test/0-510.log
+       ./testdither 0 1020 > test/0-1020.pgm 2>test/0-1020.log
 
 
 #
@@ -308,11 +319,12 @@ testdither:               testdither.o libcupsdriver.a ../cups/libcups.a
 
 testrgb:               testrgb.o libcupsdriver.a ../cups/libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testrgb.o libcupsdriver.a ../cups/libcups.a \
-               $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testrgb.o libcupsdriver.a \
+               ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
        if test ! -d test; then \
                mkdir test; \
        fi
+       echo Running RGB API tests...
        ./testrgb > test/testrgb.log 2>&1 || echo "RGB tests failed!"
 
 

diff --git a/filter/Makefile b/filter/Makefile
index 8f5633d4681c2e99612e470a8c25dd797da624f9..e3af510ec11ec0ef861c3061a4351e8357fa6717 100644 (file)
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -18,16 +18,28 @@
 include ../Makedefs
 
 
-FILTERS        =       commandtops gziptoany hpgltops texttops pstops $(IMGFILTERS) \
-               $(PDFTOPS) rastertolabel rastertoepson rastertohp
-TARGETS        =       $(FILTERS) \
+FILTERS        =       \
+               commandtops \
+               gziptoany \
+               hpgltops \
+               texttops \
+               pstops \
+               $(IMGFILTERS) \
+               $(PDFTOPS) \
+               rastertolabel \
+               rastertoepson \
+               rastertohp
+LIBTARGETS =   \
                $(LIBCUPSIMAGE) \
                libcupsimage.a \
                $(LIB32CUPSIMAGE) \
                $(LIB64CUPSIMAGE) \
-               rasterbench \
-               testimage \
                testraster
+TARGETS        =       \
+               $(LIBTARGETS) \
+               $(FILTERS) \
+               rasterbench \
+               testimage
 
 HPGLOBJS =     hpgl-attr.o hpgl-config.o hpgl-main.o hpgl-prolog.o \
                hpgl-char.o hpgl-input.o hpgl-polygon.o hpgl-vector.o
@@ -52,6 +64,13 @@ OBJS =       $(HPGLOBJS) $(IMAGEOBJS) $(FORMOBJS) \
 all:   $(TARGETS)
 
 
+#
+# Make library targets...
+#
+
+libs:          $(LIBTARGETS)
+
+
 #
 # Clean all object files...
 #
@@ -408,8 +427,11 @@ rastertohp:        rastertohp.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
 
 testraster:    testraster.o ../cups/libcups.a libcupsimage.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testraster.o libcupsimage.a ../cups/libcups.a \
-               $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) $(SSLLIBS) $(LIBGSSAPI)
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testraster.o libcupsimage.a \
+               ../cups/libcups.a $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \
+               $(SSLLIBS) $(LIBGSSAPI)
+       echo Running raster API tests...
+       ./testraster
 
 
 #

diff --git a/fonts/Makefile b/fonts/Makefile
index a570c754264bd0852b812d1442a44dc64a917606..760c3af3cbbbdd1f76ee0a409b5e2c57dbcd5775 100644 (file)
--- a/fonts/Makefile
+++ b/fonts/Makefile
@@ -30,6 +30,13 @@ FONTS        =       Courier Courier-Bold Courier-BoldOblique Courier-Oblique \
 all:
 
 
+#
+# Make library targets...
+#
+
+libs:
+
+
 #
 # Clean all config and object files...
 #

diff --git a/locale/Makefile b/locale/Makefile
index d70bb51bca2a4a1c8832064269dd7715d6b79979..2567475b245afb7ce6f092186b357fa321a0cbca 100644 (file)
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -27,6 +27,13 @@ TARGETS      =       checkpo po2strings strings2po translate
 all:   $(TARGETS)
 
 
+#
+# Make library targets...
+#
+
+libs:
+
+
 #
 # Clean all config and object files...
 #

diff --git a/man/Makefile b/man/Makefile
index f68ec632dc39ef1bdf7e170209252ad254cebf05..f36146b8f17f72ae87c594050f2ae1c8b1e5166d 100644 (file)
--- a/man/Makefile
+++ b/man/Makefile
@@ -75,6 +75,13 @@ MAN8 =       accept.$(MAN8EXT) \
 all:   $(MAN1) $(MAN5) $(MAN7) $(MAN8) html
 
 
+#
+# Make library targets...
+#
+
+libs:
+
+
 #
 # Clean all config and object files...
 #

diff --git a/monitor/Makefile b/monitor/Makefile
index c7282583da63109dcb4192e99669cb3907ecd686..3a265c932cff96a15460aa510dbf765d26ccf67e 100644 (file)
--- a/monitor/Makefile
+++ b/monitor/Makefile
@@ -29,6 +29,13 @@ OBJS =       bcp.o tbcp.o
 all:   $(TARGETS)
 
 
+#
+# Make library targets...
+#
+
+libs:
+
+
 #
 # Clean all object files...
 #

diff --git a/notifier/Makefile b/notifier/Makefile
index d5c5a7247fa46b2623125bec8ab349e113f5d5a2..0bada1afc0d46df02f1386695651b855b0f9e116 100644 (file)
--- a/notifier/Makefile
+++ b/notifier/Makefile
@@ -27,6 +27,13 @@ OBJS =       mailto.o rss.o testnotify.o
 all:   $(TARGETS)
 
 
+#
+# Make library targets...
+#
+
+libs:
+
+
 #
 # Clean all object files...
 #

diff --git a/ppdc/Makefile b/ppdc/Makefile
index 24611c4376bfbacd211228cd3958296ed3afaf13..aed8208ddc2a7a37ac9de818f9f7999cdeb78d8e 100644 (file)
--- a/ppdc/Makefile
+++ b/ppdc/Makefile
@@ -56,13 +56,15 @@ OBJS =              \
                ppdi.o \
                ppdmerge.o \
                ppdpo.o
-TARGETS        =       \
+LIBTARGETS =   \
                $(LIBCUPSPPDC) \
                $(LIB32CUPSPPDC) \
                $(LIB64CUPSPPDC) \
                libcupsppdc.a \
+               ppdc-static
+TARGETS        =       \
+               $(LIBTARGETS) \
                drv \
-               ppdc-static \
                ppdc \
                ppdhtml \
                ppdi \
@@ -77,6 +79,13 @@ TARGETS      =       \
 all:           $(TARGETS)
 
 
+#
+# Make library targets...
+#
+
+libs:          $(LIBTARGETS)
+
+
 #
 # Clean everything...
 #
@@ -275,8 +284,8 @@ ppdc:                       ppdc.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
 
 ppdc-static:           ppdc.o libcupsppdc.a  ../cups/libcups.a foo.drv foo-fr.po
        echo Linking $@...
-       $(CXX) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a ../cups/libcups.a \
-               $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+       $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \
+               ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
        echo Testing PPD compiler...
        ./ppdc-static -l en,fr -I ../data foo.drv
        ./ppdc-static -l en,fr -z -I ../data foo.drv

diff --git a/scheduler/Makefile b/scheduler/Makefile
index 486f4033b89df085eada8c5be88343284cea2719..5b70e6f405874f409ea3bf9be63685b9079ba533 100644 (file)
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -62,20 +62,24 @@ OBJS        =       \
                testspeed.o \
                testsub.o \
                util.o
+
+LIBTARGETS =   \
+               $(LIBCUPSMIME) \
+               $(LIB32CUPSMIME) \
+               $(LIB64CUPSMIME) \
+               libcupsmime.a \
+               testmime
+
 TARGETS        =       \
+               $(LIBTARGETS) \
                cupsd \
                cupsfilter \
                cups-deviced \
                cups-driverd \
                cups-lpd \
                cups-polld \
-               $(LIBCUPSMIME) \
-               $(LIB32CUPSMIME) \
-               $(LIB64CUPSMIME) \
-               libcupsmime.a \
                testdirsvc \
                testlpd \
-               testmime \
                testspeed \
                testsub
 
@@ -87,6 +91,13 @@ TARGETS      =       \
 all:           $(TARGETS)
 
 
+#
+# Make library targets...
+#
+
+libs:          $(LIBTARGETS)
+
+
 #
 # Clean all object files...
 #
@@ -480,8 +491,10 @@ testlpd:   testlpd.o ../cups/libcups.a cups-lpd
 
 testmime:      testmime.o libcupsmime.a ../cups/libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testmime.o libcupsmime.a ../cups/libcups.a \
-               $(COMMONLIBS) $(LIBZ) $(SSLLIBS) $(LIBGSSAPI)
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testmime.o libcupsmime.a \
+               ../cups/libcups.a $(COMMONLIBS) $(LIBZ) $(SSLLIBS) $(LIBGSSAPI)
+       echo Running MIME tests...
+       ./testmime
 
 
 #

diff --git a/standards/Makefile b/standards/Makefile
index 72e5fd651a6adb29678f555185fabdff2abb390f..e69b84ca4bda35e6b57113c0ace72b0ed9d58ea9 100644 (file)
--- a/standards/Makefile
+++ b/standards/Makefile
@@ -68,6 +68,13 @@ RFCS =       \
 all:   rfctohtml $(RFCS:.txt=.html)
 
 
+#
+# Make library targets...
+#
+
+libs:
+
+
 #
 # Clean all config and object files...
 #
@@ -131,7 +138,7 @@ uninstall:
 #
 
 rfctohtml:     rfctohtml.o ../cups/libcups.a
-       $(CC) $(LDFLAGS) -o $@ rfctohtml.o ../cups/libcups.a \
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ rfctohtml.o ../cups/libcups.a \
                $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
 
 

diff --git a/systemv/Makefile b/systemv/Makefile
index 1298e0dced0db4b16f16df292a42738668423360..b4e0103bf6aafff2d8bb4fb1e4979092d5634ae8 100644 (file)
--- a/systemv/Makefile
+++ b/systemv/Makefile
@@ -29,6 +29,13 @@ OBJS =       accept.o cancel.o cupsaddsmb.o cupsctl.o cupstestdsc.o \
 all:   $(TARGETS)
 
 
+#
+# Make library targets...
+#
+
+libs:
+
+
 #
 # Clean all object files...
 #

diff --git a/templates/Makefile b/templates/Makefile
index d00fde3ae1b0fbb14048a1e35570f64372e32908..62af3ab21aecbbededb3247935bb62b2e3fb8cd2 100644 (file)
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -96,6 +96,13 @@ FILES        =       \
 all:
 
 
+#
+# Make library targets...
+#
+
+libs:
+
+
 #
 # Clean all config and object files...
 #

diff --git a/test/Makefile b/test/Makefile
index 625591dbe6c593a9c2a14b56476fca729ddf333b..9090ba6abe91817f00d266b89fd38f0e66d2b653 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -23,6 +23,13 @@ include ../Makedefs
 all:   ipptest
 
 
+#
+# Make library targets...
+#
+
+libs:
+
+
 #
 # Clean all object files...
 #