aboutsummaryrefslogtreecommitdiff
path: root/libfontenc/src/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-05-27 08:40:26 +0000
committermarha <marha@users.sourceforge.net>2010-05-27 08:40:26 +0000
commit3426068372bd22820b608b72212bb7e2c339d997 (patch)
tree4ea22fa4bcc1c5208b2e1d3e895c721a329dda1e /libfontenc/src/Makefile.am
parent958dcdff6d845fcff20a414bd28be8ee2ced8c6c (diff)
parent8eb713a9d1beed1965288a642a0650d7ba58b4b3 (diff)
downloadvcxsrv-3426068372bd22820b608b72212bb7e2c339d997.tar.gz
vcxsrv-3426068372bd22820b608b72212bb7e2c339d997.tar.bz2
vcxsrv-3426068372bd22820b608b72212bb7e2c339d997.zip
svn merge ^/branches/released .
Diffstat (limited to 'libfontenc/src/Makefile.am')
-rw-r--r--libfontenc/src/Makefile.am63
1 files changed, 32 insertions, 31 deletions
diff --git a/libfontenc/src/Makefile.am b/libfontenc/src/Makefile.am
index 8cd09112d..54b735584 100644
--- a/libfontenc/src/Makefile.am
+++ b/libfontenc/src/Makefile.am
@@ -1,31 +1,32 @@
-lib_LTLIBRARIES = libfontenc.la
-
-libfontenc_la_SOURCES = \
- encparse.c \
- fontenc.c \
- fontencI.h
-
-AM_CFLAGS = @FONTENC_CFLAGS@
-
-FONTENCDIR=@ENCODINGSDIR@
-FONTENCDEFS = -DFONT_ENCODINGS_DIRECTORY=\"$(FONTENCDIR)/encodings.dir\"
-
-INCLUDES = -I$(top_srcdir)/include \
- -DFONTENC_NO_LIBFONT $(FONTENCDEFS)
-
-
-libfontenc_la_LIBADD = @FONTENC_LIBS@
-
-libfontenc_la_LDFLAGS = -version-number 1:0:0 -no-undefined
-
-libfontencincludedir = $(includedir)/X11/fonts
-libfontencinclude_HEADERS = \
- $(top_srcdir)/include/X11/fonts/fontenc.h
-
-if LINT
-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS)
-
-lint:
- $(LINT) $(ALL_LINT_FLAGS) $(libfontenc_la_SOURCES) $(libfontenc_la_LIBADD) $(LIBS)
-endif LINT
+lib_LTLIBRARIES = libfontenc.la
+
+libfontenc_la_SOURCES = \
+ encparse.c \
+ fontenc.c \
+ fontencI.h
+
+AM_CFLAGS = \
+ $(FONTENC_CFLAGS) \
+ $(CWARNFLAGS)
+
+FONTENCDIR=@ENCODINGSDIR@
+FONTENCDEFS = -DFONT_ENCODINGS_DIRECTORY=\"$(FONTENCDIR)/encodings.dir\"
+
+INCLUDES = -I$(top_srcdir)/include $(FONTENCDEFS)
+
+
+libfontenc_la_LIBADD = @FONTENC_LIBS@
+
+libfontenc_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+
+libfontencincludedir = $(includedir)/X11/fonts
+libfontencinclude_HEADERS = \
+ $(top_srcdir)/include/X11/fonts/fontenc.h
+
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS)
+
+lint:
+ $(LINT) $(ALL_LINT_FLAGS) $(libfontenc_la_SOURCES) $(libfontenc_la_LIBADD) $(LIBS)
+endif LINT