diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2005-09-05 17:02:56 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2005-09-05 17:02:56 +0000 |
| commit | 69a1b10dd38c06f34747e7a55d62fdfcec2883cc (patch) | |
| tree | e10fd932e747549b9c88d3af4fa0dd81a8eb17e1 /src/post/planar | |
| parent | b8578b7dfbada9cb57940bfec5b844ea0e871970 (diff) | |
| download | xine-lib-69a1b10dd38c06f34747e7a55d62fdfcec2883cc.tar.gz xine-lib-69a1b10dd38c06f34747e7a55d62fdfcec2883cc.tar.bz2 | |
*BUGFIX*
Build improvements and WIN32 port updates:
- add --with-pthread-pefix and --with-zlib-pefix options
- prepare for removing internal zlib and pthreads-win32 relics,
updated documentation for possible WIN32 developers (only for me? :->)
- fixed bug in unimportant part of configure.ac for MinGW due to xine paths
- fixed my bug in cdda (but it compiled fine anyway)
- fixed unimportant bug in planar Makefile.am
- next MSVC update due to external zlib, pthreads and latest changes,
removed relic includes
- checked distcheck
CVS patchset: 7719
CVS date: 2005/09/05 17:02:56
Diffstat (limited to 'src/post/planar')
| -rw-r--r-- | src/post/planar/Makefile.am | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am index f0c512228..ee40f6771 100644 --- a/src/post/planar/Makefile.am +++ b/src/post/planar/Makefile.am @@ -1,22 +1,27 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = -I$(top_srcdir)/src/libffmpeg/libavcodec/libpostproc +POSTPROC_INT_LIB = $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la + if HAVE_FFMPEG -POSTPROC_LIB = $(FFMPEG_POSTPROC_LIBS) +postproc_lib = $(FFMPEG_POSTPROC_LIBS) +ff_cppflags = $(FFMPEG_CPPFLAGS) else -POSTPROC_LIB = $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la -POSTPROC_DEP = $(POSTPROC_LIB) +ff_cppflags = -I$(top_srcdir)/src/libffmpeg/libavcodec/libpostproc +postproc_lib = $(POSTPROC_INT_LIB) +postproc_dep = $(postproc_lib) endif +AM_CPPFLAGS = $(ff_cppflags) + libdir = $(XINE_PLUGINDIR)/post lib_LTLIBRARIES = xineplug_post_planar.la xineplug_post_planar_la_SOURCES = planar.c invert.c expand.c fill.c boxblur.c \ denoise3d.c eq.c eq2.c unsharp.c pp.c -xineplug_post_planar_la_DEPENDENCIES = $(POSTPROC_DEP) -xineplug_post_planar_la_LIBADD = $(XINE_LIB) $(POSTPROC_LIB) -lm $(THREAD_LIBS) +xineplug_post_planar_la_DEPENDENCIES = $(postproc_dep) +xineplug_post_planar_la_LIBADD = $(XINE_LIB) $(postproc_lib) -lm $(THREAD_LIBS) xineplug_post_planar_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ -$(POSTPROC_LIB): +$(POSTPROC_INT_LIB): cd $(top_builddir)/src/libffmpeg/libavcodec/libpostproc && $(MAKE) libpostprocess.la |