notify: remove recursion

diff --git a/configure.ac b/configure.ac
index 08e04f44f7c4ed7c854e356ef126672c75b8973f..527f55500c24e239ca99830b0224d177292e7bb4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4198,7 +4198,6 @@ AC_CONFIG_FILES([
   modules/gui/skins2/Makefile
   modules/misc/Makefile
   modules/mux/Makefile
-  modules/notify/Makefile
   modules/packetizer/Makefile
   modules/stream_filter/Makefile
   modules/stream_out/Makefile

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 98faadd32c521a42f43a8b8ed6267341da8f5f08..2a634e9aa5a17ebd05060adafab83b42c7426da8 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -7,7 +7,6 @@ BASE_SUBDIRS = \
        control \
        gui \
        misc \
-       notify \
        packetizer \
        stream_filter \
        text_renderer \
@@ -43,6 +42,7 @@ include codec/Makefile.am
 include demux/Makefile.am
 include lua/Makefile.am
 include meta_engine/Makefile.am
+include notify/Makefile.am
 include services_discovery/Makefile.am
 
 BUILT_SOURCES += dummy.cpp

diff --git a/modules/notify/Makefile.am b/modules/notify/Makefile.am
index 84153c4e5cf9133220a2bde54387277e33f1c6cd..0e33cac123becef2967fdd707732f0ba2843a145 100644 (file)
--- a/modules/notify/Makefile.am
+++ b/modules/notify/Makefile.am
@@ -1,16 +1,15 @@
-include $(top_srcdir)/modules/common.am
 notifydir = $(pluginsdir)/notify
 
-AM_LDFLAGS += -rpath '$(notifydir)'
-
-libgrowl_plugin_la_SOURCES = growl.m
+libgrowl_plugin_la_SOURCES = notify/growl.m
 libgrowl_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) $(OBJCFLAGS_growl)
+libgrowl_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(notifydir)'
 libgrowl_plugin_la_LIBADD = $(LIBS_growl)
-libgrowl_plugin_la_LIBTOOLFLAGS=--tag=CC
+libgrowl_plugin_la_LIBTOOLFLAGS = --tag=CC
 
-libnotify_plugin_la_SOURCES = notify.c
+libnotify_plugin_la_SOURCES = notify/notify.c
 libnotify_plugin_la_CFLAGS = $(AM_CFLAGS) $(NOTIFY_CFLAGS)
+libnotify_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(notifydir)'
 libnotify_plugin_la_LIBADD = $(NOTIFY_LIBS)
 
-notify_LTLIBRARIES =  $(LTLIBgrowl) $(LTLIBnotify)
-EXTRA_LTLIBRARIES = libgrowl_plugin.la libnotify_plugin.la
+notify_LTLIBRARIES = $(LTLIBgrowl) $(LTLIBnotify)
+EXTRA_LTLIBRARIES += libgrowl_plugin.la libnotify_plugin.la