Merge changes from CUPS 1.6svn-r10112.

[thirdparty/cups.git] / cups / Makefile

diff --git a/cups/Makefile b/cups/Makefile
index 6052bec01ebaf8654b9b397869fc18ff10659ca3..be6bd42997a04cb178439effbd60a8ac751b69b4 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -120,6 +120,7 @@ HEADERSPRIV =       \
                md5-private.h \
                ppd-private.h \
                pwg-private.h \
+               raster-private.h \
                snmp-private.h \
                string-private.h \
                thread-private.h
@@ -376,7 +377,7 @@ libcups_s.a:        $(LIBOBJS) libcups_s.exp
        echo Creating $@...
        $(DSO) $(DSOFLAGS) -Wl,-bexport:libcups_s.exp -o libcups_s.o \
                $(LIBOBJS) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
-               $(COMMONLIBS) $(LIBZ) -lm
+               $(COMMONLIBS) $(LIBZ)
        $(RM) $@
        $(AR) $(ARFLAGS) $@ libcups_s.o
 
@@ -585,7 +586,7 @@ apihelp:
                file.h file.c dir.h dir.c >../doc/help/api-filedir.html
        mxmldoc --tokens api-filedir.xml >../doc/help/api-filedir.tokens
        $(RM) api-filedir.xml
-       mxmldoc --section "Programming" --title "PPD API" \
+       mxmldoc --section "Programming" --title "PPD API (DEPRECATED)" \
                --css ../doc/cups-printable.css \
                --header api-ppd.header --intro api-ppd.shtml \
                api-ppd.xml \
@@ -637,7 +638,7 @@ framedhelp:
                --header api-filedir.header --intro api-filedir.shtml \
                file.h file.c dir.h dir.c
        mxmldoc --framed api-ppd \
-               --section "Programming" --title "PPD API" \
+               --section "Programming" --title "PPD API (DEPRECATED)" \
                --css ../doc/cups-printable.css \
                --header api-ppd.header --intro api-ppd.shtml \
                ppd.h attr.c conflicts.c custom.c emit.c localize.c mark.c \