diff options
| -rw-r--r-- | Makefile.am.marshal | 45 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 10 | ||||
| -rw-r--r-- | src/sound-service-marshal.list | 2 |
4 files changed, 0 insertions, 60 deletions
diff --git a/Makefile.am.marshal b/Makefile.am.marshal deleted file mode 100644 index a6ab024..0000000 --- a/Makefile.am.marshal +++ /dev/null @@ -1,45 +0,0 @@ -# Rules for generating marshal files using glib-genmarshal -# -# Define: -# glib_marshal_list = marshal list file -# glib_marshal_prefix = prefix for marshal functions -# -# before including Makefile.am.marshal. You will also need to have -# the following targets already defined: -# -# CLEANFILES -# DISTCLEANFILES -# BUILT_SOURCES -# EXTRA_DIST -# -# Author: Emmanuele Bassi <ebassi@linux.intel.com> - -marshal_h = $(glib_marshal_list:.list=.h) -marshal_c = $(glib_marshal_list:.list=.c) - -CLEANFILES += stamp-marshal -DISTCLEANFILES += $(marshal_h) $(marshal_c) -BUILT_SOURCES += $(marshal_h) $(marshal_c) -EXTRA_DIST += $(glib_marshal_list) - -stamp-marshal: $(glib_marshal_list) - $(QUIET_GEN)$(GLIB_GENMARSHAL) \ - --prefix=$(glib_marshal_prefix) \ - --header \ - $(srcdir)/$(glib_marshal_list) > xgen-mh \ - && (cmp -s xgen-mh $(marshal_h) || cp -f xgen-mh $(marshal_h)) \ - && rm -f xgen-mh \ - && echo timestamp > $(@F) - -$(marshal_h): stamp-marshal - @true - -$(marshal_c): $(marshal_h) - $(QUIET_GEN)(echo "#include \"$(marshal_h)\"" ; \ - $(GLIB_GENMARSHAL) \ - --prefix=$(glib_marshal_prefix) \ - --body \ - $(srcdir)/$(glib_marshal_list)) > xgen-mc \ - && cp xgen-mc $(marshal_c) \ - && rm -f xgen-mc - diff --git a/configure.ac b/configure.ac index ee5ff2b..8fdebb8 100644 --- a/configure.ac +++ b/configure.ac @@ -21,8 +21,6 @@ AC_CONFIG_MACRO_DIR([m4]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) -AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) - ########################### # Dependencies ########################### @@ -75,7 +73,6 @@ AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all ########################### GLIB_GSETTINGS -GLIB_GENMARSHAL ########################### # DBus Service Info diff --git a/src/Makefile.am b/src/Makefile.am index 993b0d2..afbc364 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,13 +1,5 @@ libexec_PROGRAMS = indicator-sound-service -#################################################################### -# Sound Service -#################################################################### - -glib_marshal_list = sound-service-marshal.list -glib_marshal_prefix = _sound_service_marshal - - ##################### # Sound service vala ##################### @@ -80,5 +72,3 @@ CLEANFILES = \ $(BUILT_SOURCES) DISTCLEANFILES = - -include $(top_srcdir)/Makefile.am.marshal diff --git a/src/sound-service-marshal.list b/src/sound-service-marshal.list deleted file mode 100644 index 4c756d4..0000000 --- a/src/sound-service-marshal.list +++ /dev/null @@ -1,2 +0,0 @@ -VOID:STRING,STRING - |