notify: remove recursion

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

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

modules/notify/Makefile.am

-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