Non-Kerberized IPP printing to Windows was broken (Issue #5515)

[thirdparty/cups.git] / cups / Makefile

diff --git a/cups/Makefile b/cups/Makefile
index a751aadaa5dac7260259cf1848dc2632681db06c..38080914d36925f231c86de5913210520dd99076 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -117,25 +117,29 @@ OBJS      =       \
 # Header files to install...
 #
 
-HEADERS        =       \
-               adminutil.h \
+COREHEADERS    =       \
                array.h \
-               backend.h \
                cups.h \
                dir.h \
                file.h \
                http.h \
                ipp.h \
                language.h \
-               ppd.h \
                pwg.h \
                raster.h \
-               sidechannel.h \
                transcode.h \
                versioning.h
 
-HEADERSPRIV =  \
-               ../config.h \
+DRIVERHEADERS  =       \
+               adminutil.h \
+               backend.h \
+               ppd.h \
+               sidechannel.h
+
+HEADERS                =       \
+               $(LIBHEADERS)
+
+COREHEADERSPRIV =      \
                array-private.h \
                cups-private.h \
                debug-private.h \
@@ -143,13 +147,18 @@ HEADERSPRIV =     \
                http-private.h \
                ipp-private.h \
                language-private.h \
-               ppd-private.h \
                pwg-private.h \
                raster-private.h \
-               snmp-private.h \
                string-private.h \
                thread-private.h
 
+DRIVERHEADERSPRIV      =       \
+               ppd-private.h \
+               snmp-private.h
+
+HEADERSPRIV    =       \
+               $(LIBHEADERSPRIV)
+
 
 #
 # Targets in this directory...
@@ -641,11 +650,6 @@ testlang:  testlang.o $(LIBCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Creating locale directory structure...
        $(RM) -r locale
-       $(MKDIR) locale/en
-       echo 'msgid "No"' > locale/en/cups_en.po
-       echo 'msgstr "No"' >> locale/en/cups_en.po
-       echo 'msgid "Yes"' >> locale/en/cups_en.po
-       echo 'msgstr "Yes"' >> locale/en/cups_en.po
        for po in ../locale/cups_*.po; do \
                lang=`basename $$po .po | sed -e '1,$$s/^cups_//'`; \
                $(MKDIR) locale/$$lang; \