diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 14:29:10 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 14:29:10 +0000 |
| commit | ddfb922180a6a847d52609592a2bdb37179ca439 (patch) | |
| tree | 7cc662bfb9ffb45c4c4452ea373e3c1a843b395a /libXfont/Makefile.am | |
| parent | 02934f83dd4f5848083e2e5cdbc6ef7f60361f06 (diff) | |
| parent | 2fb179f86b0f9ecb7876759b87f9c64634a3f114 (diff) | |
| download | vcxsrv-ddfb922180a6a847d52609592a2bdb37179ca439.tar.gz vcxsrv-ddfb922180a6a847d52609592a2bdb37179ca439.tar.bz2 vcxsrv-ddfb922180a6a847d52609592a2bdb37179ca439.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Gives currently link errors. xorg-server needs to be upgraded to.
Diffstat (limited to 'libXfont/Makefile.am')
| -rw-r--r-- | libXfont/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libXfont/Makefile.am b/libXfont/Makefile.am index bb908c204..1da055b7e 100644 --- a/libXfont/Makefile.am +++ b/libXfont/Makefile.am @@ -31,7 +31,6 @@ libXfontinclude_HEADERS = \ include/X11/fonts/fntfilst.h \ include/X11/fonts/fontencc.h \ include/X11/fonts/fontmisc.h \ - include/X11/fonts/fontmod.h \ include/X11/fonts/fontshow.h \ include/X11/fonts/fontutil.h \ include/X11/fonts/fontxlfd.h \ @@ -44,7 +43,7 @@ nodist_libXfontinclude_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xfont.pc -EXTRA_DIST = xfont.pc.in autogen.sh include/X11/fonts/fontconf.h.in +EXTRA_DIST = xfont.pc.in ChangeLog include/X11/fonts/fontconf.h.in .PHONY: ChangeLog |