diff options
author | Stefan Holst <holstsn@users.sourceforge.net> | 2003-04-06 15:50:56 +0000 |
---|---|---|
committer | Stefan Holst <holstsn@users.sourceforge.net> | 2003-04-06 15:50:56 +0000 |
commit | ea9ae4923bc169fd74b32aa090fd60b684fbd09a (patch) | |
tree | e6c64b03953e4be0ec35775ec2cd3fd090862dbc /src/xine-engine/Makefile.am | |
parent | cdbcc573496460d11714e827c02644e42a5bc5e2 (diff) | |
download | xine-lib-ea9ae4923bc169fd74b32aa090fd60b684fbd09a.tar.gz xine-lib-ea9ae4923bc169fd74b32aa090fd60b684fbd09a.tar.bz2 |
- freetype2 support for osd
- png autoconf improvements
CVS patchset: 4554
CVS date: 2003/04/06 15:50:56
Diffstat (limited to 'src/xine-engine/Makefile.am')
-rw-r--r-- | src/xine-engine/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 2a4987922..e79353708 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = nvtv -AM_CFLAGS = $(THREAD_CFLAGS) $(X_CFLAGS) @ANSI_FLAGS@ +AM_CFLAGS = $(THREAD_CFLAGS) $(X_CFLAGS) $(FT2_CFLAGS) @ANSI_FLAGS@ lib_LTLIBRARIES = libxine.la @@ -20,11 +20,11 @@ libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \ if HAVE_NVTV libxine_la_DEPENDENCIES = @INTLLIBS@ $(XINEUTILS_LIB) $(NVTVCLIENT_LIB) libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS) \ - -lm $(XINEUTILS_LIB) $(NVTVCLIENT_LIB) $(GICONV_BSD_LIBS) + -lm $(XINEUTILS_LIB) $(NVTVCLIENT_LIB) $(GICONV_BSD_LIBS) $(FT2_LIBS) else libxine_la_DEPENDENCIES = @INTLLIBS@ $(XINEUTILS_LIB) libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS) \ - -lm $(XINEUTILS_LIB) $(GICONV_BSD_LIBS) + -lm $(XINEUTILS_LIB) $(GICONV_BSD_LIBS) $(FT2_LIBS) endif libxine_la_LDFLAGS = \ @@ -42,7 +42,7 @@ noinst_HEADERS = bswap.h @INCLUDED_INTL_TRUE@ @cd $(top_builddir)/intl && $(MAKE) libintl.la debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(THREAD_CFLAGS) $(X_CFLAGS)" + @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(THREAD_CFLAGS) $(X_CFLAGS) $(FT2_CFLAGS)" install-debug: debug @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am |