diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-01-21 08:42:04 -0500 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-01-21 08:42:04 -0500 |
| commit | d728c2935e7bd57d82a0fe5aea6b38168375d9ec (patch) | |
| tree | 78cb3eb3acede5ae2f403d7b499159a73109e24c | |
| parent | 588c22056a599c944f12f84b06244e6cd93ba0a2 (diff) | |
| download | cups-d728c2935e7bd57d82a0fe5aea6b38168375d9ec.tar.gz | |
Clean up installation of private headers.
Clean up generation of api help.
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | cups/Makefile | 14 |
2 files changed, 4 insertions, 15 deletions
@@ -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 84c4e3cb4..a751aadaa 100644 --- 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 # |