Skip to content

Commit

Permalink
Add fontenc directory, update buildsystem
Browse files Browse the repository at this point in the history
  • Loading branch information
sorensp committed Jun 21, 2005
1 parent db8fd7e commit fda7215
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand Down
1 change: 1 addition & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -162,4 +162,5 @@ AC_OUTPUT([Makefile
src/fc/Makefile
src/util/Makefile
src/stubs/Makefile
src/fontenc/Makefile
xfont.pc])
14 changes: 14 additions & 0 deletions src/fontenc/Makefile.am
Original file line number Diff line number Diff line change
@@ -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@

0 comments on commit fda7215

Please # to comment.