aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Uebernickel <lars.uebernickel@canonical.com>2013-04-04 05:57:18 +0200
committerLars Uebernickel <lars.uebernickel@canonical.com>2013-04-04 05:57:18 +0200
commit69fc4a3d92bbbf5940769d877650e45a9c2b913b (patch)
tree19e6d6d514fbd8c3a8d4ad7b199d7f235c9ef13c
parent838d4366a4c5e159ef7cde4caef4d908730df3a7 (diff)
downloadayatana-indicator-sound-69fc4a3d92bbbf5940769d877650e45a9c2b913b.tar.gz
ayatana-indicator-sound-69fc4a3d92bbbf5940769d877650e45a9c2b913b.tar.bz2
ayatana-indicator-sound-69fc4a3d92bbbf5940769d877650e45a9c2b913b.zip
Remove sound-service-marshal (not needed anymore)
-rw-r--r--Makefile.am.marshal45
-rw-r--r--configure.ac3
-rw-r--r--src/Makefile.am10
-rw-r--r--src/sound-service-marshal.list2
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
-