Merge changes from main repository.

7 files changed, 6 insertions, 20 deletions

diff --git a/src/post/audio/Makefile.am b/src/post/audio/Makefile.am
index 9cb93dd5a..f4018a780 100644
--- a/src/post/audio/Makefile.am
+++ b/src/post/audio/Makefile.am
@@ -2,9 +2,7 @@ include $(top_srcdir)/misc/Makefile.common
 
 noinst_HEADERS = dsp.h filter.h window.h audio_filters.h
 
-libdir = $(XINE_PLUGINDIR)/post
-
-lib_LTLIBRARIES = xineplug_post_audio_filters.la
+xinepost_LTLIBRARIES = xineplug_post_audio_filters.la
 
 xineplug_post_audio_filters_la_SOURCES = \
         upmix.c upmix_mono.c filter.c window.c stretch.c volnorm.c audio_filters.c
diff --git a/src/post/deinterlace/Makefile.am b/src/post/deinterlace/Makefile.am
index 0914e114a..d2d1d5c10 100644
--- a/src/post/deinterlace/Makefile.am
+++ b/src/post/deinterlace/Makefile.am
@@ -4,9 +4,7 @@ SUBDIRS = plugins
 
 EXTRA_DIST = 
 
-libdir = $(XINE_PLUGINDIR)/post
-
-lib_LTLIBRARIES = xineplug_post_tvtime.la
+xinepost_LTLIBRARIES = xineplug_post_tvtime.la
 
 xineplug_post_tvtime_la_SOURCES = xine_plugin.c \
 	deinterlace.c pulldown.c speedy.c tvtime.c 
diff --git a/src/post/deinterlace/plugins/Makefile.am b/src/post/deinterlace/plugins/Makefile.am
index e6e785211..17d170127 100644
--- a/src/post/deinterlace/plugins/Makefile.am
+++ b/src/post/deinterlace/plugins/Makefile.am
@@ -32,8 +32,6 @@ EXTRA_DIST = greedy2frame_template.c greedyh.asm \
 AM_CFLAGS = -I$(top_srcdir)/src/post/deinterlace \
 	-I$(top_srcdir)/src/libffmpeg/libavcodec/libpostproc
 
-libdir = $(XINE_PLUGINDIR)/post
-
 noinst_LTLIBRARIES = libdeinterlaceplugins.la
 
 libdeinterlaceplugins_la_SOURCES = \
diff --git a/src/post/goom/Makefile.am b/src/post/goom/Makefile.am
index 4aeda8f04..e6bae3374 100644
--- a/src/post/goom/Makefile.am
+++ b/src/post/goom/Makefile.am
@@ -1,7 +1,5 @@
 include $(top_srcdir)/misc/Makefile.common
 
-libdir = $(XINE_PLUGINDIR)/post
-
 EXTRA_DIST = mmx.c xmmx.c ppc_drawings.s ppc_zoom_ultimate.s diff_against_release.patch \
 	gfontrle.c mathtools.c
 
@@ -10,7 +8,7 @@ EXTRA_DIST = mmx.c xmmx.c ppc_drawings.s ppc_zoom_ultimate.s diff_against_releas
 #CFLAGS = `echo @CFLAGS@ | sed -e 's/-fomit-frame-pointer//g;s/-Os/-O2/g'`
 CFLAGS = `echo @CFLAGS@ | sed -e 's/-Os/-O2/g'`
 
-lib_LTLIBRARIES = xineplug_post_goom.la
+xinepost_LTLIBRARIES = xineplug_post_goom.la
 
 ## doesn't work
 #if PPC_ARCH
diff --git a/src/post/mosaico/Makefile.am b/src/post/mosaico/Makefile.am
index f5497b1af..c18b4e19c 100644
--- a/src/post/mosaico/Makefile.am
+++ b/src/post/mosaico/Makefile.am
@@ -1,8 +1,6 @@
 include $(top_srcdir)/misc/Makefile.common
 
-libdir = $(XINE_PLUGINDIR)/post
-
-lib_LTLIBRARIES = xineplug_post_mosaico.la xineplug_post_switch.la
+xinepost_LTLIBRARIES = xineplug_post_mosaico.la xineplug_post_switch.la
 
 xineplug_post_mosaico_la_SOURCES = mosaico.c
 xineplug_post_mosaico_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am
index 2e60671b5..5fc425cdf 100644
--- a/src/post/planar/Makefile.am
+++ b/src/post/planar/Makefile.am
@@ -15,9 +15,7 @@ endif
 # work, but at least it compiles.
 AM_CFLAGS = $(ff_cflags) -fomit-frame-pointer
 
-libdir = $(XINE_PLUGINDIR)/post
-
-lib_LTLIBRARIES = xineplug_post_planar.la
+xinepost_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 noise.c
diff --git a/src/post/visualizations/Makefile.am b/src/post/visualizations/Makefile.am
index dc7679103..f42598d9c 100644
--- a/src/post/visualizations/Makefile.am
+++ b/src/post/visualizations/Makefile.am
@@ -2,9 +2,7 @@ include $(top_srcdir)/misc/Makefile.common
 
 EXTRA_DIST = fooviz.c
 
-libdir = $(XINE_PLUGINDIR)/post
-
-lib_LTLIBRARIES = xineplug_post_visualizations.la
+xinepost_LTLIBRARIES = xineplug_post_visualizations.la
 
 xineplug_post_visualizations_la_SOURCES = \
         visualizations.c fft.c fftscope.c oscope.c fftgraph.c