7 files changed, 7 insertions, 21 deletions
diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am
index d52f700f3..1329b0f62 100644
--- a/src/audio_out/Makefile.am
+++ b/src/audio_out/Makefile.am
@@ -4,8 +4,6 @@ AM_CPPFLAGS = -DXINE_COMPILE
 
 EXTRA_DIST = audio_irixal_out.c
 
-libdir = $(XINE_PLUGINDIR)
-
 if HAVE_OSS
 oss_module = xineplug_ao_out_oss.la
 endif
@@ -57,7 +55,7 @@ endif
 # all xine audio out plugins should be named like the 
 # scheme "xineplug_ao_out_"
 #
-lib_LTLIBRARIES = xineplug_ao_out_none.la xineplug_ao_out_file.la \
+xineplug_LTLIBRARIES = xineplug_ao_out_none.la xineplug_ao_out_file.la \
 	$(oss_module) \
 	$(alsa_module) \
 	$(sun_module) \
diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am
index 8bf9c9427..5f413f804 100644
--- a/src/dxr3/Makefile.am
+++ b/src/dxr3/Makefile.am
@@ -2,8 +2,6 @@ include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS = $(X_CFLAGS) $(LIBFAME_CFLAGS)
 
-libdir = $(XINE_PLUGINDIR)
-
 if HAVE_DXR3
 dxr3_modules = xineplug_decode_dxr3_video.la \
 	xineplug_decode_dxr3_spu.la \
@@ -19,7 +17,7 @@ if HAVE_LIBRTE
 link_rte = -lrte
 endif
 
-lib_LTLIBRARIES = $(dxr3_modules) 
+xineplug_LTLIBRARIES = $(dxr3_modules) 
 
 xineplug_decode_dxr3_video_la_SOURCES = dxr3_decode_video.c
 xineplug_decode_dxr3_video_la_LIBADD = $(XINE_LIB) 
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index 68adf84be..a2a1ea3a4 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -8,8 +8,6 @@ else
 SUBDIRS = vcd dvb libreal librtsp libdvdnav
 endif
 
-libdir = $(XINE_PLUGINDIR)
-
 ##
 # IMPORTANT:
 # ---------
@@ -52,7 +50,7 @@ endif
 
 AM_CFLAGS = -D_LARGEFILE64_SOURCE $(GNOME_VFS_CFLAGS) $(ALSA_CFLAGS) $(DVD_CFLAGS)
 
-lib_LTLIBRARIES = \
+xineplug_LTLIBRARIES = \
 	xineplug_inp_file.la \
 	xineplug_inp_http.la \
 	$(in_dvd) \
diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am
index 98903aac8..16eece779 100644
--- a/src/input/vcd/Makefile.am
+++ b/src/input/vcd/Makefile.am
@@ -2,14 +2,12 @@ include $(top_srcdir)/misc/Makefile.common
 
 SUBDIRS = libcdio libvcd
 
-libdir = $(XINE_PLUGINDIR)
-
 vcd_SRCS = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c
 
 EXTRA_DIST = $(vcd_SRCS)
 
 if ENABLE_VCD
-lib_LTLIBRARIES = xineplug_inp_vcd.la
+xineplug_LTLIBRARIES = xineplug_inp_vcd.la
 
 AM_CFLAGS = $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS)
 
diff --git a/src/libspucc/Makefile.am b/src/libspucc/Makefile.am
index ec12c1bc7..aefe4d7c1 100644
--- a/src/libspucc/Makefile.am
+++ b/src/libspucc/Makefile.am
@@ -1,8 +1,6 @@
 include $(top_srcdir)/misc/Makefile.common
 
-libdir = $(XINE_PLUGINDIR)
-
-lib_LTLIBRARIES = xineplug_decode_spucc.la
+xineplug_LTLIBRARIES = xineplug_decode_spucc.la
 
 xineplug_decode_spucc_la_SOURCES =  cc_decoder.c xine_cc_decoder.c
 xineplug_decode_spucc_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) -fno-strict-aliasing
diff --git a/src/libspudvb/Makefile.am b/src/libspudvb/Makefile.am
index b4ae9befe..e385e5553 100644
--- a/src/libspudvb/Makefile.am
+++ b/src/libspudvb/Makefile.am
@@ -1,8 +1,6 @@
 include $(top_srcdir)/misc/Makefile.common
 
-libdir = $(XINE_PLUGINDIR)
-
-lib_LTLIBRARIES = xineplug_decode_spudvb.la
+xineplug_LTLIBRARIES = xineplug_decode_spudvb.la
 
 xineplug_decode_spudvb_la_SOURCES = xine_spudvb_decoder.c
 xineplug_decode_spudvb_la_LIBADD  = $(XINE_LIB) $(PTHREAD_LIBS)
diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am
index 46027d0f1..358eea40a 100644
--- a/src/libw32dll/Makefile.am
+++ b/src/libw32dll/Makefile.am
@@ -9,9 +9,7 @@ w32dll_codec = xineplug_decode_w32dll.la
 qt_codec = xineplug_decode_qt.la
 endif
 
-libdir = $(XINE_PLUGINDIR)
-
-lib_LTLIBRARIES = $(w32dll_codec) $(qt_codec)
+xineplug_LTLIBRARIES = $(w32dll_codec) $(qt_codec)
 
 EXTRA_DIST = common.c