diff options
| author | Keith Packard <keithp@koto.keithp.com> | 2007-11-13 15:48:30 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@koto.keithp.com> | 2007-11-13 15:48:30 -0800 |
| commit | 1315db01b626aedd27e3e05bde96ce46c253629b (patch) | |
| tree | ad73fd414e5c11ec7022dc6d806c8fdd3e75ce76 /fontconfig/Makefile.am | |
| parent | eaf4470a465cbfb95e2ba4df017d45f7b1d9c131 (diff) | |
| download | fontconfig-1315db01b626aedd27e3e05bde96ce46c253629b.tar.gz | |
Revert "Remove fcprivate.h, move the remaining macros to fcint.h."
This reverts commit b607922909acfc7ae96de688ed34efd19cd038ac.
Conflicts:
src/Makefile.am
Xft still uses the macros that are in fcprivate.h. Document those macros and
include fcprivate.h in the published header files.
Diffstat (limited to 'fontconfig/Makefile.am')
| -rw-r--r-- | fontconfig/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fontconfig/Makefile.am b/fontconfig/Makefile.am index 7616d8f..72fec33 100644 --- a/fontconfig/Makefile.am +++ b/fontconfig/Makefile.am @@ -2,6 +2,7 @@ fontconfigincludedir=$(includedir)/fontconfig fontconfig_headers= \ fontconfig.h \ - fcfreetype.h + fcfreetype.h \ + fcprivate.h fontconfiginclude_HEADERS = $(fontconfig_headers) |