Clean up installation of private headers.

Clean up generation of api help.

diff --git a/Makefile b/Makefile
index ae6cf37746c48f619913602d9ca75dab82c8efa8..5bf14cc5d78558a40c48e04bf45836cb54db4863 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -197,11 +197,6 @@ install-headers:
                echo Installing header files in $$dir... ;\
                (cd $$dir; $(MAKE) $(MFLAGS) install-headers) || exit 1;\
        done
-       if test "x$(privateinclude)" != x; then \
-               echo Installing config.h into $(PRIVATEINCLUDE)...; \
-               $(INSTALL_DIR) -m 755 $(PRIVATEINCLUDE); \
-               $(INSTALL_DATA) config.h $(PRIVATEINCLUDE)/config.h; \
-       fi
 
 
 #

diff --git a/cups/Makefile b/cups/Makefile
index 84c4e3cb4f4f7f053cfc1738a87d6ab57aef56be..a751aadaa5dac7260259cf1848dc2632681db06c 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -1,8 +1,8 @@
 #
 # Library Makefile for CUPS.
 #
-# Copyright 2007-2019 by Apple Inc.
-# Copyright 1997-2006 by Easy Software Products, all rights reserved.
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1997-2006 by Easy Software Products, all rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
 # information.
@@ -135,6 +135,7 @@ HEADERS     =       \
                versioning.h
 
 HEADERSPRIV =  \
+               ../config.h \
                array-private.h \
                cups-private.h \
                debug-private.h \
@@ -748,29 +749,22 @@ apihelp:
        codedoc --section "Programming" --title "Administration APIs" \
                --css ../doc/cups-printable.css \
                --header api-admin.header --intro api-admin.shtml \
-               api-admin.xml \
                adminutil.c adminutil.h getdevices.c >../doc/help/api-admin.html
-       $(RM) api-admin.xml
        codedoc --section "Programming" --title "PPD API (DEPRECATED)" \
                --css ../doc/cups-printable.css \
                --header api-ppd.header --intro api-ppd.shtml \
-               api-ppd.xml ppd.h ppd-*.c >../doc/help/api-ppd.html
-       $(RM) api-ppd.xml
+               ppd.h ppd-*.c >../doc/help/api-ppd.html
        codedoc --section "Programming" --title "Raster API" \
                --css ../doc/cups-printable.css \
                --header api-raster.header --intro api-raster.shtml \
-               api-raster.xml \
                ../cups/raster.h interpret.c raster.c \
                >../doc/help/api-raster.html
-       $(RM) api-raster.xml
        codedoc --section "Programming" \
                --title "Filter and Backend Programming" \
                --css ../doc/cups-printable.css \
                --header api-filter.header --intro api-filter.shtml \
-               api-filter.xml \
                backchannel.c backend.h backend.c sidechannel.c sidechannel.h \
                >../doc/help/api-filter.html
-       $(RM) api-filter.xml
 
 
 #