diff --git a/legacy/emotion/src/lib/Makefile.am b/legacy/emotion/src/lib/Makefile.am index 21930584cb..652395a474 100644 --- a/legacy/emotion/src/lib/Makefile.am +++ b/legacy/emotion/src/lib/Makefile.am @@ -4,7 +4,6 @@ AUTOMAKE_OPTIONS = 1.4 foreign MAINTAINERCLEANFILES = Makefile.in -LDFLAGS = INCLUDES = -I$(includedir) \ -I$(top_srcdir) \ -I$(top_srcdir)/src/lib \ @@ -16,6 +15,6 @@ libemotion_la_SOURCES = \ emotion_smart.c \ emotion_private.h -libemotion_la_LIBADD = $(LDFLAGS) @my_libs@ @dlopen_libs@ +libemotion_la_LIBADD = @my_libs@ @dlopen_libs@ libemotion_la_DEPENDENCIES = $(top_builddir)/config.h libemotion_la_LDFLAGS = -version-info 0:1:0 diff --git a/legacy/emotion/src/modules/Makefile.am b/legacy/emotion/src/modules/Makefile.am index 9403be3b1f..bba080af5b 100644 --- a/legacy/emotion/src/modules/Makefile.am +++ b/legacy/emotion/src/modules/Makefile.am @@ -6,7 +6,6 @@ SUBDIRS = xine MAINTAINERCLEANFILES = Makefile.in -LDFLAGS = INCLUDES = -I$(includedir) \ -I$(top_srcdir) \ -I$(top_srcdir)/src/lib \ @@ -20,8 +19,6 @@ emotion_decoder_xine_la_SOURCES = \ emotion_xine.c \ emotion_xine.h emotion_decoder_xine_la_LIBADD = @my_libs@ @xine_libs@ -emotion_decoder_xine_la_LDFLAGS = \ -$(LDFLAGS) \ --module -avoid-version \ --L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs +emotion_decoder_xine_la_LDFLAGS = -module -avoid-version \ + -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs emotion_decoder_xine_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/legacy/emotion/src/modules/xine/Makefile.am b/legacy/emotion/src/modules/xine/Makefile.am index d249514df4..561768d8ec 100644 --- a/legacy/emotion/src/modules/xine/Makefile.am +++ b/legacy/emotion/src/modules/xine/Makefile.am @@ -4,7 +4,6 @@ MAINTAINERCLEANFILES = Makefile.in -LDFLAGS = INCLUDES = -I$(includedir) \ -I$(top_srcdir) \ -I$(top_srcdir)/src/lib \ @@ -15,11 +14,9 @@ INCLUDES = -I$(includedir) \ pkgdir = @xine_plugins@ pkg_LTLIBRARIES = xineplug_vo_out_emotion.la -xineplug_vo_out_emotion_la_SOURCES = \ -emotion_xine_vo_out.c + +xineplug_vo_out_emotion_la_SOURCES = emotion_xine_vo_out.c xineplug_vo_out_emotion_la_LIBADD = @xine_libs@ -xineplug_vo_out_emotion_la_LDFLAGS = \ -$(LDFLAGS) \ --module -avoid-version \ --L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs +xineplug_vo_out_emotion_la_LDFLAGS = -module -avoid-version \ + -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs xineplug_vo_out_emotion_la_DEPENDENCIES = $(top_builddir)/config.h