diff options
| author | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-06-21 21:29:40 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-06-21 21:29:40 +0000 |
| commit | fda7215c0783ad170eb14f7dda078fac3f134470 (patch) | |
| tree | 5aae58dd377e66454fff76e1e44f9c87865c0d2a | |
| parent | db8fd7e670cbd901116344212217bee8001ab460 (diff) | |
Add fontenc directory, update buildsystem
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/fontenc/Makefile.am | 14 |
3 files changed, 16 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 65b40fa..af2b43b 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) + $(TYPE1_DIR) $(SPEEDO_DIR) src/fontenc libXfont_la_LIBADD = $(FREETYPE_LIB) $(BITMAP_LIB) $(BUILTINS_LIB) \ $(FC_LIB) $(FONTFILE_LIB) $(UTIL_LIB) $(STUBS_LIB) \ diff --git a/configure.ac b/configure.ac index da3343c..0a7441b 100644 --- a/configure.ac +++ b/configure.ac @@ -162,4 +162,5 @@ AC_OUTPUT([Makefile src/fc/Makefile src/util/Makefile src/stubs/Makefile + src/fontenc/Makefile xfont.pc]) diff --git a/src/fontenc/Makefile.am b/src/fontenc/Makefile.am new file mode 100644 index 0000000..93e9fe6 --- /dev/null +++ b/src/fontenc/Makefile.am @@ -0,0 +1,14 @@ +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@ |