From ca0b9854a9793feb59b4d028311064e3897e8a5c Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Wed, 27 Nov 2002 19:58:21 +0000 Subject: [PATCH] not sure what I did wrong but this should fix it hopefully Original commit message from CVS: not sure what I did wrong but this should fix it hopefully --- ext/Makefile.am | 11 +++++++++-- ext/libpng/Makefile.am | 1 - 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ext/Makefile.am b/ext/Makefile.am index c2a973f..28ecac7 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -148,6 +148,12 @@ else LIBFAME_DIR= endif +if USE_LIBPNG +LIBPNG_DIR=libpng +else +LIBPNG_DIR= +endif + if USE_MAD MAD_DIR=mad else @@ -244,7 +250,8 @@ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \ $(DVDREAD_DIR) $(DVDNAV_DIR) $(ESD_DIR) \ $(FFMPEG_DIR) $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \ $(HERMES_DIR) $(HTTP_DIR) $(JACK_DIR) $(JPEG_DIR) \ - $(LADSPA_DIR) $(LAME_DIR) $(LCS_DIR) $(LIBDV_DIR) $(LIBFAME_DIR) \ + $(LADSPA_DIR) $(LAME_DIR) $(LCS_DIR) \ + $(LIBDV_DIR) $(LIBFAME_DIR) $(LIBPNG_DIR) \ $(MAD_DIR) $(MIKMOD_DIR) $(MJPEGTOOLS_DIR) $(MPEG2DEC_DIR) \ $(OPENQUICKTIME_DIR) $(RAW1394_DIR) $(RTP_DIR) \ $(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \ @@ -258,7 +265,7 @@ DIST_SUBDIRS=\ dvdread dvdnav esd ffmpeg \ flac gnomevfs gsm \ hermes http jack jpeg \ - ladspa lame lcs libfame \ + ladspa lame lcs libfame libpng \ mad mikmod mjpegtools mpeg2dec \ openquicktime raw1394 rtp \ sdl shout sidplay \ diff --git a/ext/libpng/Makefile.am b/ext/libpng/Makefile.am index 41e8e0f..a0fad8d 100644 --- a/ext/libpng/Makefile.am +++ b/ext/libpng/Makefile.am @@ -8,4 +8,3 @@ libgstpng_la_LIBADD = $(GST_LIBS) $(LIBPNG_LIBS) libgstpng_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstpngenc.h - -- 2.7.4