- 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
    <X11/fonts/fontenc.h> 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

4 files changed, 2 insertions, 19 deletions

diff --git a/src/Type1/t1funcs.c b/src/Type1/t1funcs.c
index ef99b93..64ff16e 100644
--- a/src/Type1/t1funcs.c
+++ b/src/Type1/t1funcs.c
@@ -133,7 +133,7 @@ from The Open Group.
 #include "fntfilst.h"
 #include "fontutil.h"
 #include <X11/fonts/FSproto.h>
-#include "fontenc.h"
+#include <X11/fonts/fontenc.h>
 #include "t1unicode.h"
  
 #ifdef BUILDCID
diff --git a/src/fontenc/Makefile.am b/src/fontenc/Makefile.am
deleted file mode 100644
index 93e9fe6..0000000
--- a/src/fontenc/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-FONTDIR=${libdir}/X11/fonts
-FONTENCDEFS = -DFONT_ENCODINGS_DIRECTORY=\"$(FONTDIR)/encodings/encodings.dir\"
-
-INCLUDES =			\
-	-I${top_srcdir}/include/X11/fonts \
-	$(FONTENCDEFS)		
-
-lib_LTLIBRARIES = libfontenc.la
-
-libfontenc_la_SOURCES =					\
-	$(top_srcdir)/src/fontfile/encparse.c		\
-	$(top_srcdir)/src/fontfile/fontenc.c
-
-libfontenc_la_LIBADD = @X_LIBS@
diff --git a/src/fontfile/Makefile.am b/src/fontfile/Makefile.am
index 1ba16b9..6e70425 100644
--- a/src/fontfile/Makefile.am
+++ b/src/fontfile/Makefile.am
@@ -16,13 +16,10 @@ libfontfile_la_SOURCES = 	\
 	decompress.c		\
 	defaults.c		\
 	dirfile.c		\
-	encparse.c		\
 	ffcheck.c		\
 	fileio.c		\
 	filewr.c		\
 	fontdir.c		\
-	fontenc.c		\
-	fontencI.h		\
 	fontencc.c		\
 	fontfile.c		\
 	fontscale.c		\
diff --git a/src/fontfile/fontencc.c b/src/fontfile/fontencc.c
index cc77748..3e02582 100644
--- a/src/fontfile/fontencc.c
+++ b/src/fontfile/fontencc.c
@@ -28,7 +28,7 @@ THE SOFTWARE.
    *not* provide source compatibility, as many of the data structures
    now have different names. */
 
-#include "fontenc.h"
+#include <X11/fonts/fontenc.h>
 #include "fontencc.h"
 
 extern void ErrorF(const char *f, ...);