vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat Sep 28 16:04:54 2013 +0300| [edce6f5d66ead6a513af0e75e3b0bfaedb29215b] | committer: Rémi Denis-Courmont
notify: remove recursion > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=edce6f5d66ead6a513af0e75e3b0bfaedb29215b --- configure.ac | 1 - modules/Makefile.am | 2 +- modules/notify/Makefile.am | 15 +++++++-------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 08e04f4..527f555 100644 --- 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 98faadd..2a634e9 100644 --- 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 84153c4..0e33cac 100644 --- 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 _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
