From 4534fa0c8adb77b7db47101318e0e863edb186ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Mon, 27 Jun 2005 16:09:14 +0000 Subject: - Remove fontenc from Xfont - Add a dependency from Xfont on libfontenc - Add build system for lib/fontenc - xc/lib/font: Change #include "fontenc.h" to #include in some places. - Remove dpsinfo and dpsexec from the app section of symlink.sh - Fix xp.pc.in to add XPRINT_LIBS/CFLAGS instead of X_LIBS/CFLAGS --- Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index af2b43b..86032b1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -71,7 +71,7 @@ STUBS_DIR = src/stubs SUBDIRS=$(FONTFILE_DIR) $(FREETYPE_DIR) $(BITMAP_DIR) \ $(BUILTINS_DIR) $(FC_DIR) $(UTIL_DIR) $(STUBS_DIR) $(FONTCACHE_DIR) \ - $(TYPE1_DIR) $(SPEEDO_DIR) src/fontenc + $(TYPE1_DIR) $(SPEEDO_DIR) libXfont_la_LIBADD = $(FREETYPE_LIB) $(BITMAP_LIB) $(BUILTINS_LIB) \ $(FC_LIB) $(FONTFILE_LIB) $(UTIL_LIB) $(STUBS_LIB) \ @@ -93,7 +93,6 @@ libXfontinclude_HEADERS = \ include/X11/fonts/fntfilio.h \ include/X11/fonts/fntfilst.h \ include/X11/fonts/fontconf.h \ - include/X11/fonts/fontenc.h \ include/X11/fonts/fontencc.h \ include/X11/fonts/fontmisc.h \ include/X11/fonts/fontmod.h \ -- cgit v1.2.3