Remove gtk and dbusmenu. Sorry for the big changeset.

I'd appreciate a good deal of testing before merging this into the wild ;).

Approved by Charles Kerr, PS Jenkins bot.

1 files changed, 18 insertions, 155 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 55df0f6..da3df5b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,173 +1,36 @@
-libexec_PROGRAMS = indicator-sound-service
+pkglibexec_PROGRAMS = indicator-sound-service
 
-###################
-# Indicator Stuff
-###################
-
-soundmenulibdir = $(INDICATORDIR)
-soundmenulib_LTLIBRARIES = libsoundmenu.la
-libsoundmenu_la_SOURCES = \
-            common-defs.h \
-            indicator-sound.h \
-            indicator-sound.c \
-            sound-state.c \
-            sound-state.h \
-            sound-state-manager.c \
-            sound-state-manager.h \
-            transport-widget.c \
-            transport-widget.h \
-            metadata-widget.c \
-            metadata-widget.h \
-            mute-widget.c \
-            mute-widget.h \
-            volume-widget.c \
-            volume-widget.h \
-            voip-input-widget.c \
-            voip-input-widget.h \
-            gen-sound-service.xml.h \
-            gen-sound-service.xml.c \
-            dbus-shared-names.h
-
-libsoundmenu_la_CFLAGS = \
-	$(APPLET_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	-Wall -Werror -DG_LOG_DOMAIN=\"Indicator-Sound\"
-libsoundmenu_la_LIBADD = $(APPLET_LIBS) -lm
-libsoundmenu_la_LDFLAGS = \ 
-	$(COVERAGE_LDFLAGS) \
-	-module -avoid-version
-
-
-checkxml: $(srcdir)/sound-service.xml
-	@xmllint -valid -noout $<
-	@echo $< checks out ok
-
-
-####################################################################
-# Sound Service 
-####################################################################
-
-glib_marshal_list = sound-service-marshal.list
-glib_marshal_prefix = _sound_service_marshal
-
-
-#####################
-# Sound service vala
-#####################
-music_bridge_VALASOURCES = \
-	music-player-bridge.vala \
-	transport-menu-item.vala \
-	specific-items-manager.vala \
-	metadata-menu-item.vala \
-	player-controller.vala \
+indicator_sound_service_SOURCES = \
+	service.vala \
+	main.vala \
+	volume-control.vala \
+	media-player.vala \
+	media-player-list.vala \
 	mpris2-interfaces.vala \
 	mpris2-watcher.vala \
-	mpris2-controller.vala \
-	player-item.vala \
-	settings-manager.vala \
-	playlists-menu-item.vala \
-	freedesktop-interfaces.vala \
-	fetch-file.vala \
-	player-activator.vala
+	freedesktop-interfaces.vala
 
-music_bridge_VALAFLAGS = \
+indicator_sound_service_VALAFLAGS = \
   --ccode \
-  -H music-player-bridge.h -d . \
   --vapidir=$(top_srcdir)/vapi/ \
   --vapidir=./ \
   --thread \
-  --pkg gee-1.0 \
-  --pkg Dbusmenu-0.4 \
-  --pkg common-defs \
   --pkg config \
   --pkg gio-2.0 \
   --pkg gio-unix-2.0 \
-  --pkg gdk-3.0 \
-  --pkg gdk-x11-3.0 \
-  --pkg gdk-pixbuf-2.0 \
-  --pkg libbamf3 \
-  --pkg libxml-2.0
-
- $(MAINTAINER_VALAFLAGS)
-
-music_bridge_APIFILES = \
-  music-player-bridge.h 
-
-music_bridge_vala.stamp $(music_bridge_APIFILES): $(music_bridge_VALASOURCES)
-	$(AM_V_GEN) $(VALAC) $(music_bridge_VALAFLAGS) $^
-	touch music_bridge_vala.stamp
-
-###############################
-# Sound Service C
-###############################
-indicator_sound_service_SOURCES = \
-  common-defs.h \
-  sound-service.h \
-  sound-service.c \
-  sound-state.c \
-  sound-state.h \
-  pulseaudio-mgr.h \
-  pulseaudio-mgr.c \
-  device.c \
-  device.h \
-  sound-service-dbus.h \
-  sound-service-dbus.c \
-  slider-menu-item.h \
-  slider-menu-item.c \
-  voip-input-menu-item.h \
-  voip-input-menu-item.c \
-  mute-menu-item.h \
-  mute-menu-item.c \
-  gen-sound-service.xml.h \
-  gen-sound-service.xml.c \
-  sound-service-marshal.c \
-  sound-service-marshal.h \
-  $(music_bridge_VALASOURCES:.vala=.c)
+  --pkg libxml-2.0 \
+  --pkg libpulse \
+  --pkg libpulse-mainloop-glib \
+  --target-glib=2.36
 
+# -w to disable warnings for vala-generated code
 indicator_sound_service_CFLAGS = $(PULSEAUDIO_CFLAGS) \
 	$(SOUNDSERVICE_CFLAGS) \
 	$(GCONF_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
-	-DLIBEXECDIR=\"$(libexecdir)\" -Wall
+	-DLIBEXECDIR=\"$(libexecdir)\" \
+	-w \
+	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"
+
 indicator_sound_service_LDADD = $(PULSEAUDIO_LIBS) $(SOUNDSERVICE_LIBS) $(GCONF_LIBS)
 indicator_sound_service_LDFLAGS = $(COVERAGE_LDFLAGS)
-
-#########################
-# Service xml compilation
-#########################
-DBUS_SPECS = \
-  sound-service.xml
-
-gen-%.xml.h: %.xml
-	@echo "Building $@ from $<"
-	@echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<))));" > $@
-
-gen-%.xml.c: %.xml
-	@echo "Building $@ from $<"
-	@echo "const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<)))) = " > $@
-	@sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@
-	@echo ";" >> $@
-
-
-EXTRA_DIST = \
-  $(DBUS_SPECS) \
-  sound-service.xml \
-  $(music_bridge_APIFILES) \
-  $(music_bridge_VALASOURCES)
-  
-#######################
-# Stuff to clean Stuff
-#######################
-BUILT_SOURCES = \
-	music_bridge_vala.stamp \
-	$(music_bridge_APIFILES) \
-	gen-sound-service.xml.h \
-	gen-sound-service.xml.c \
-	$(music_bridge_VALASOURCES:.vala=.c)
-  
-CLEANFILES = \
-	$(BUILT_SOURCES)
-
-DISTCLEANFILES = 
-
-include $(top_srcdir)/Makefile.am.marshal