diff options
-rw-r--r-- | fsoaudiod/configure.ac | 8 | ||||
-rw-r--r-- | fsoaudiod/src/alsa_hooks/Makefile.am | 4 | ||||
-rw-r--r-- | fsoaudiod/src/alsa_hooks/session/Makefile.am | 65 | ||||
-rw-r--r-- | fsoaudiod/src/bin/Makefile.am | 54 | ||||
-rw-r--r-- | fsoaudiod/src/lib/Makefile.am | 81 | ||||
-rw-r--r-- | fsoaudiod/src/plugins/gsmvoice_alsa_cmtspeechdata/Makefile.am | 86 | ||||
-rw-r--r-- | fsoaudiod/src/plugins/gsmvoice_alsa_forwarder/Makefile.am | 81 | ||||
-rw-r--r-- | fsoaudiod/src/plugins/manager/Makefile.am | 79 | ||||
-rw-r--r-- | fsoaudiod/src/plugins/router_alsa/Makefile.am | 79 | ||||
-rw-r--r-- | fsoaudiod/src/plugins/router_palmpre/Makefile.am | 77 | ||||
-rw-r--r-- | fsoaudiod/src/plugins/sessionpolicy_default/Makefile.am | 77 | ||||
-rw-r--r-- | fsoaudiod/src/plugins/streamcontrol_alsa/Makefile.am | 79 | ||||
-rw-r--r-- | fsoaudiod/src/plugins/system_integration/Makefile.am | 79 |
13 files changed, 315 insertions, 534 deletions
diff --git a/fsoaudiod/configure.ac b/fsoaudiod/configure.ac index f79f7d92..e9e32ef4 100644 --- a/fsoaudiod/configure.ac +++ b/fsoaudiod/configure.ac @@ -9,7 +9,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS(config.h) -AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip]) +AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip tar-ustar]) AM_MAINTAINER_MODE([enable]) AC_PROG_CC @@ -212,11 +212,11 @@ echo " gsmvoice_alsa_cmtspeechdata:.........: $cmtspeechdata" echo echo " gsmvoice_alsa_forwarder:.............: $samplerate" echo -echo " Vala....................: $enable_vala" +echo " Vala.................................: $enable_vala" echo -echo " Vala Compiler...........: ${VALAC}" +echo " Vala Compiler........................: ${VALAC}" echo -echo " debug build..........................: $debug" +echo " debug build..........................: $enable_debug" echo echo " prefix...............................: $prefix" echo diff --git a/fsoaudiod/src/alsa_hooks/Makefile.am b/fsoaudiod/src/alsa_hooks/Makefile.am index a2699607..8a395b63 100644 --- a/fsoaudiod/src/alsa_hooks/Makefile.am +++ b/fsoaudiod/src/alsa_hooks/Makefile.am @@ -3,6 +3,4 @@ NULL = AUTOMAKE_OPTIONS = subdir-objects -SUBDIRS = \ - session \ - $(NULL) +SUBDIRS = session diff --git a/fsoaudiod/src/alsa_hooks/session/Makefile.am b/fsoaudiod/src/alsa_hooks/session/Makefile.am index 791822ff..84cd74b3 100644 --- a/fsoaudiod/src/alsa_hooks/session/Makefile.am +++ b/fsoaudiod/src/alsa_hooks/session/Makefile.am @@ -1,55 +1,36 @@ include $(top_srcdir)/Makefile.decl - NULL = -AM_CFLAGS = \ - $(GLIB_CFLAGS) \ - $(ALSA_CFLAGS) \ +AM_CPPFLAGS = \ + -include $(CONFIG_HEADER) \ -DG_LOG_DOMAIN=\"fsoaudio.alsa_hook\" \ $(NULL) +AM_VALAFLAGS = -progs_ldadd = \ - $(GLIB_LIBS) \ - $(ALSA_LIBS) \ - $(NULL) +if WANT_DEBUG +AM_VALAFLAGS += -g -D DEBUG +AM_CPPFLAGS += -ggdb -O0 +endif -VALAC_ARGS = \ +modlibexecdir = $(libdir)/alsa-lib +modlibexec_LTLIBRARIES = fsoaudio_session.la +fsoaudio_session_la_SOURCES = \ + plugin.vala \ + alsa-wrapper.c \ + $(NULL) +fsoaudio_session_la_VALAFLAGS = \ --basedir $(top_srcdir) \ --pkg alsa \ --pkg glib-2.0 \ --pkg gio-2.0 \ $(NULL) - -if WANT_DEBUG -VALAC_ARGS += -g -D DEBUG -AM_CFLAGS += -ggdb -O0 -endif - -# -# plugin -# -modlibexecdir = $(libdir)/alsa-lib -modlibexec_LTLIBRARIES = fsoaudio_session.la -fsoaudio_session_la_SOURCES = alsa-wrapper.c plugin.c -fsoaudio_session_la_VALASOURCES = plugin.vala -$(fsoaudio_session_la_SOURCES): $(fsoaudio_session_la_VALASOURCES) - $(VALAC) -C $(VALAC_ARGS) $^ - touch $@ -fsoaudio_session_la_LIBADD = $(progs_ldadd) -fsoaudio_session_la_LDFLAGS = -no-undefined -module -avoid-version -fsoaudio_session_la_LIBTOOLFLAGS = --tag=disable-static - -EXTRA_DIST += \ - $(fsoaudio_session_la_VALASOURCES) \ - $(fsoaudio_session_la_SOURCES) \ +fsoaudio_session_la_CPPFLAGS = \ + $(GLIB_CFLAGS) \ + $(ALSA_CFLAGS) \ $(NULL) - -CLEANFILES = \ - $(fsoaudio_session_la_VALASOURCES:.vala=.c) \ - *.la \ - *.lo \ - $(NULL) - -MAINTAINERCLEANFILES = \ - Makefile.in \ - $(NULL) +fsoaudio_session_la_LIBADD = \ + $(GLIB_LIBS) \ + $(ALSA_LIBS) \ + $(NULL) +fsoaudio_session_la_LDFLAGS = -no-undefined -module -avoid-version +# fsoaudio_session_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/fsoaudiod/src/bin/Makefile.am b/fsoaudiod/src/bin/Makefile.am index e750cc65..1584dac5 100644 --- a/fsoaudiod/src/bin/Makefile.am +++ b/fsoaudiod/src/bin/Makefile.am @@ -1,50 +1,32 @@ include $(top_srcdir)/Makefile.decl - NULL = -INCLUDES = \ - $(FSO_CFLAGS) \ - $(GLIB_CFLAGS) \ +AM_CPPFLAGS = \ -include $(CONFIG_HEADER) \ + -DG_LOG_DOMAIN=\"fsoaudio\" \ $(NULL) +AM_VALAFLAGS = -BUILT_SOURCES = .vala.stamp +if WANT_DEBUG +AM_VALAFLAGS += -g -D DEBUG +AM_CPPFLAGS += -ggdb -O0 +endif sbin_PROGRAMS = fsoaudiod - -fsoaudiod_VALASOURCES = \ - main.vala \ +fsoaudiod_SOURCES = main.vala +fsoaudiod_VALAFLAGS = \ + --basedir $(top_srcdir) \ + --vapidir $(top_srcdir)/vapi \ + --pkg posix \ + --pkg gio-2.0 \ + --pkg fsoframework-2.0 \ + --save-temps \ $(NULL) - -fsoaudiod_SOURCES = \ - $(fsoaudiod_VALASOURCES:.vala=.c) \ +fsoaudiod_CPPFLAGS = \ + $(FSO_CFLAGS) \ + $(GLIB_CFLAGS) \ $(NULL) - -$(BUILT_SOURCES): $(fsoaudiod_VALASOURCES) - $(VALAC) -C --vapidir vapi \ - --pkg posix \ - --pkg gio-2.0 \ - --pkg fsoframework-2.0 \ - --save-temps \ - --basedir $(top_srcdir) $^ - touch $@ - fsoaudiod_LDADD = \ $(FSO_LIBS) \ $(GLIB_LIBS) \ $(NULL) - -EXTRA_DIST += \ - $(fsoaudiod_VALASOURCES) \ - $(BUILT_SOURCES) \ - $(NULL) - -CLEANFILES = \ - *.c \ - *.h \ - $(BUILT_SOURCES) \ - $(NULL) - -MAINTAINERCLEANFILES = \ - Makefile.in \ - $(NULL) diff --git a/fsoaudiod/src/lib/Makefile.am b/fsoaudiod/src/lib/Makefile.am index 898f408f..d6d5079b 100644 --- a/fsoaudiod/src/lib/Makefile.am +++ b/fsoaudiod/src/lib/Makefile.am @@ -1,16 +1,26 @@ include $(top_srcdir)/Makefile.decl - NULL = -AM_CFLAGS = \ - -I$(top_srcdir) \ - $(FSO_CFLAGS) \ - $(ALSA_CFLAGS) \ - $(GEE_CFLAGS) \ - $(GLIB_CFLAGS) \ +AM_CPPFLAGS = \ + -include $(CONFIG_HEADER) \ + -DG_LOG_DOMAIN=\"fsoaudio\" \ $(NULL) +AM_VALAFLAGS = + +if WANT_DEBUG +AM_VALAFLAGS += -g -D DEBUG +AM_CPPFLAGS += -ggdb -O0 +endif -VALAC_ARGS = \ +lib_LTLIBRARIES = libfsoaudio.la +libfsoaudio_la_SOURCES = \ + router.vala \ + alsa.vala \ + sessionhandler.vala \ + sessionpolicy.vala \ + streamcontrol.vala \ + $(NULL) +libfsoaudio_la_VALAFLAGS = \ --basedir $(top_srcdir) \ --vapidir $(top_srcdir)/vapi \ --pkg glib-2.0 \ @@ -22,65 +32,34 @@ VALAC_ARGS = \ --pkg config \ --header fsoaudio.h \ --library fsoaudio-2.0 - -if WANT_DEBUG -VALAC_ARGS += -g -D DEBUG -AM_CFLAGS += -ggdb -O0 -endif - -BUILT_SOURCES = .vala.stamp fsoaudio-2.0.vapi - -lib_LTLIBRARIES = \ - libfsoaudio.la - $(NULL) - -libfsoaudio_la_VALASOURCES = \ - router.vala \ - alsa.vala \ - sessionhandler.vala \ - sessionpolicy.vala \ - streamcontrol.vala \ $(NULL) - -libfsoaudio_la_SOURCES = \ - $(BUILT_SOURCES) \ - $(libfsoaudio_la_VALASOURCES:.vala=.c) \ +libfsoaudio_la_CPPFLAGS = \ + $(FSO_CFLAGS) \ + $(ALSA_CFLAGS) \ + $(GEE_CFLAGS) \ + $(GLIB_CFLAGS) \ $(NULL) - -fsoaudioincludedir = $(includedir)/fsoframework-2.0 - -fsoaudioinclude_HEADERS = fsoaudio.h - -$(BUILT_SOURCES): $(libfsoaudio_la_VALASOURCES) - $(VALAC) -C $(VALAC_ARGS) $^ - touch $@ - libfsoaudio_la_LIBADD = \ $(FSO_LIBS) \ $(GEE_LIBS) \ $(GLIB_LIBS) \ $(ALSA_LIBS) \ $(NULL) +fsoaudioincludedir = $(includedir)/fsoframework-2.0 +fsoaudioinclude_HEADERS = fsoaudio.h vapidir = $(datadir)/vala/vapi - dist_vapi_DATA = \ fsoaudio-2.0.vapi \ fsoaudio-2.0.deps \ $(NULL) -EXTRA_DIST += \ - $(libfsoaudio_la_VALASOURCES) \ - $(libfsoaudio_la_SOURCES) \ - $(BUILT_SOURCES) - -CLEANFILES = \ - $(BUILT_SOURCES) \ - $(libfsoaudio_la_SOURCES) \ +BUILT_SOURCES = \ + fsoaudio.h \ + fsoaudio-2.0.vapi \ $(NULL) +CLEANFILES = MAINTAINERCLEANFILES = \ $(BUILT_SOURCES) \ - $(libfsoaudio_la_SOURCES) \ - Makefile.in - + $(NULL) diff --git a/fsoaudiod/src/plugins/gsmvoice_alsa_cmtspeechdata/Makefile.am b/fsoaudiod/src/plugins/gsmvoice_alsa_cmtspeechdata/Makefile.am index 57c4239e..90659fd0 100644 --- a/fsoaudiod/src/plugins/gsmvoice_alsa_cmtspeechdata/Makefile.am +++ b/fsoaudiod/src/plugins/gsmvoice_alsa_cmtspeechdata/Makefile.am @@ -1,7 +1,36 @@ include $(top_srcdir)/Makefile.decl NULL = -AM_CFLAGS = \ +AM_CPPFLAGS = \ + -include $(CONFIG_HEADER) \ + -DG_LOG_DOMAIN=\"fsoaudio\" \ + $(NULL) +AM_VALAFLAGS = + +if WANT_DEBUG +AM_VALAFLAGS += -g -D DEBUG +AM_CPPFLAGS += -ggdb -O0 +endif + +modlibexecdir = $(libdir)/cornucopia/modules/fsoaudio +modlibexec_LTLIBRARIES = gsmvoice_alsa_cmtspeechdata.la +gsmvoice_alsa_cmtspeechdata_la_SOURCES = \ + plugin.vala \ + cmthandler.vala \ + $(NULL) +gsmvoice_alsa_cmtspeechdata_la_VALAFLAGS = \ + --basedir $(top_srcdir) \ + --vapidir $(top_srcdir)/src/lib \ + --vapidir $(top_srcdir)/vapi \ + --pkg glib-2.0 \ + --pkg gee-1.0 \ + --pkg fso-glib-1.0 \ + --pkg fsoframework-2.0 \ + --pkg fsoaudio-2.0 \ + --pkg libcmtspeechdata \ + --pkg alsa \ + $(NULL) +gsmvoice_alsa_cmtspeechdata_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/vapi \ $(CMTSPEECHDATA_CFLAGS) \ @@ -10,60 +39,13 @@ AM_CFLAGS = \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ $(NULL) - -noinst_PROGRAMS = $(TEST_PROGS) - -progs_ldadd = \ - $(CMTSPEECHDATA_LIBS) \ +gsmvoice_alsa_cmtspeechdata_la_LIBADD = \ + $(CMTSPEECHDATA_LIBS) \ $(FSO_GLIB_LIBS) \ $(FSO_LIBS) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ $(top_builddir)/src/lib/libfsoaudio.la - -VALAC_ARGS = \ - --basedir $(top_srcdir) \ - --vapidir $(top_srcdir)/src/lib \ - --vapidir $(top_srcdir)/vapi \ - --pkg glib-2.0 \ - --pkg gee-1.0 \ - --pkg fso-glib-1.0 \ - --pkg fsoframework-2.0 \ - --pkg fsoaudio-2.0 \ - --pkg libcmtspeechdata \ - --pkg alsa - -if WANT_DEBUG -VALAC_ARGS += -g -D DEBUG -AM_CFLAGS += -ggdb -O0 -endif - -# -# plugin -# -modlibexecdir = $(libdir)/cornucopia/modules/fsoaudio -modlibexec_LTLIBRARIES = gsmvoice_alsa_cmtspeechdata.la -gsmvoice_alsa_cmtspeechdata_la_SOURCES = plugin.c cmthandler.c -gsmvoice_alsa_cmtspeechdata_la_VALASOURCES = plugin.vala cmthandler.vala -$(gsmvoice_alsa_cmtspeechdata_la_SOURCES): $(gsmvoice_alsa_cmtspeechdata_la_VALASOURCES) - $(VALAC) -C $(VALAC_ARGS) $^ - touch $@ -gsmvoice_alsa_cmtspeechdata_la_LIBADD = $(progs_ldadd) -gsmvoice_alsa_cmtspeechdata_la_LDFLAGS = -no-undefined -module -avoid-version -gsmvoice_alsa_cmtspeechdata_la_LIBTOOLFLAGS = --tag=disable-static - -EXTRA_DIST += \ - $(gsmvoice_alsa_cmtspeechdata_la_VALASOURCES) \ - $(gsmvoice_alsa_cmtspeechdata_la_SOURCES) \ $(NULL) - -CLEANFILES = \ - *.c \ - *.h \ - *.la \ - *.lo \ - $(NULL) - -MAINTAINERCLEANFILES = \ - Makefile.in \ - $(NULL) +gsmvoice_alsa_cmtspeechdata_la_LDFLAGS = -no-undefined -module -avoid-version +# gsmvoice_alsa_cmtspeechdata_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/fsoaudiod/src/plugins/gsmvoice_alsa_forwarder/Makefile.am b/fsoaudiod/src/plugins/gsmvoice_alsa_forwarder/Makefile.am index c18fa04a..4a1de6ff 100644 --- a/fsoaudiod/src/plugins/gsmvoice_alsa_forwarder/Makefile.am +++ b/fsoaudiod/src/plugins/gsmvoice_alsa_forwarder/Makefile.am @@ -1,7 +1,36 @@ include $(top_srcdir)/Makefile.decl NULL = -AM_CFLAGS = \ +AM_CPPFLAGS = \ + -include $(CONFIG_HEADER) \ + -DG_LOG_DOMAIN=\"fsoaudio\" \ + $(NULL) +AM_VALAFLAGS = + +if WANT_DEBUG +AM_VALAFLAGS += -g -D DEBUG +AM_CPPFLAGS += -ggdb -O0 +endif + +modlibexecdir = $(libdir)/cornucopia/modules/fsoaudio +modlibexec_LTLIBRARIES = gsmvoice_alsa_forwarder.la +gsmvoice_alsa_forwarder_la_SOURCES = \ + plugin.vala \ + alsaloop.c \ + pcmjob.c \ + control.c \ + $(NULL) +gsmvoice_alsa_forwarder_la_VALAFLAGS = \ + --basedir $(top_srcdir) \ + --vapidir $(top_srcdir)/src/lib \ + --vapidir $(top_srcdir)/vapi \ + --pkg glib-2.0 \ + --pkg gee-1.0 \ + --pkg fso-glib-1.0 \ + --pkg fsoframework-2.0 \ + --pkg fsoaudio-2.0 + $(NULL) +gsmvoice_alsa_forwarder_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/vapi \ $(FSO_CFLAGS) \ @@ -10,56 +39,12 @@ AM_CFLAGS = \ -lsamplerate -D_GNU_SOURCE \ -DHAVE_SAMPLERATE_H \ $(NULL) - -noinst_PROGRAMS = $(TEST_PROGS) - -progs_ldadd = \ +gsmvoice_alsa_forwarder_la_LIBADD = \ $(FSO_GLIB_LIBS) \ $(FSO_LIBS) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ $(top_builddir)/src/lib/libfsoaudio.la - -VALAC_ARGS = \ - --basedir $(top_srcdir) \ - --vapidir $(top_srcdir)/src/lib \ - --vapidir $(top_srcdir)/vapi \ - --pkg glib-2.0 \ - --pkg gee-1.0 \ - --pkg fso-glib-1.0 \ - --pkg fsoframework-2.0 \ - --pkg fsoaudio-2.0 - -if WANT_DEBUG -VALAC_ARGS += -g -D DEBUG -AM_CFLAGS += -ggdb -O0 -endif - -# -# plugin -# -modlibexecdir = $(libdir)/cornucopia/modules/fsoaudio -modlibexec_LTLIBRARIES = gsmvoice_alsa_forwarder.la -gsmvoice_alsa_forwarder_la_SOURCES = plugin.c alsaloop.c pcmjob.c control.c -gsmvoice_alsa_forwarder_la_VALASOURCES = plugin.vala -$(gsmvoice_alsa_forwarder_la_SOURCES): $(gsmvoice_alsa_forwarder_la_VALASOURCES) - $(VALAC) -C $(VALAC_ARGS) $^ - touch $@ -gsmvoice_alsa_forwarder_la_LIBADD = $(progs_ldadd) -gsmvoice_alsa_forwarder_la_LDFLAGS = -no-undefined -module -avoid-version -lm -gsmvoice_alsa_forwarder_la_LIBTOOLFLAGS = --tag=disable-static - -EXTRA_DIST += \ - $(gsmvoice_alsa_forwarder_la_VALASOURCES) \ - $(gsmvoice_alsa_forwarder_la_SOURCES) \ $(NULL) - -CLEANFILES = \ - plugin.c \ - *.la \ - *.lo \ - $(NULL) - -MAINTAINERCLEANFILES = \ - Makefile.in \ - $(NULL) +gsmvoice_alsa_forwarder_la_LDFLAGS = -no-undefined -module -avoid-version -lm +# gsmvoice_alsa_forwarder_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/fsoaudiod/src/plugins/manager/Makefile.am b/fsoaudiod/src/plugins/manager/Makefile.am index 50b40300..470ce3ce 100644 --- a/fsoaudiod/src/plugins/manager/Makefile.am +++ b/fsoaudiod/src/plugins/manager/Makefile.am @@ -1,24 +1,21 @@ include $(top_srcdir)/Makefile.decl NULL = -AM_CFLAGS = \ - -I$(top_srcdir)/src/lib \ - $(FSO_GLIB_CFLAGS) \ - $(FSO_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(GEE_CFLAGS) \ +AM_CPPFLAGS = \ + -include $(CONFIG_HEADER) \ + -DG_LOG_DOMAIN=\"fsoaudio\" \ $(NULL) +AM_VALAFLAGS = -noinst_PROGRAMS = $(TEST_PROGS) - -progs_ldadd = \ - $(FSO_GLIB_LIBS) \ - $(FSO_LIBS) \ - $(GLIB_LIBS) \ - $(GEE_LIBS) \ - $(top_builddir)/src/lib/libfsoaudio.la +if WANT_DEBUG +AM_VALAFLAGS += -g -D DEBUG +AM_CPPFLAGS += -ggdb -O0 +endif -VALAC_ARGS = \ +modlibexecdir = $(libdir)/cornucopia/modules/fsoaudio +modlibexec_LTLIBRARIES = manager.la +manager_la_SOURCES = plugin.vala deviceinfo.vala controlinfo.vala +manager_la_VALAFLAGS = \ --basedir $(top_srcdir) \ --vapidir $(top_srcdir)/src/lib \ --vapidir $(top_srcdir)/vapi \ @@ -26,39 +23,21 @@ VALAC_ARGS = \ --pkg gee-1.0 \ --pkg fso-glib-1.0 \ --pkg fsoframework-2.0 \ - --pkg fsoaudio-2.0 - -if WANT_DEBUG -VALAC_ARGS += -g -D DEBUG -AM_CFLAGS += -ggdb -O0 -endif - -# -# plugin -# -modlibexecdir = $(libdir)/cornucopia/modules/fsoaudio -modlibexec_LTLIBRARIES = manager.la -manager_la_SOURCES = plugin.c deviceinfo.c controlinfo.c -manager_la_VALASOURCES = plugin.vala deviceinfo.vala controlinfo.vala -$(manager_la_SOURCES): $(manager_la_VALASOURCES) - $(VALAC) -C $(VALAC_ARGS) $^ - touch $@ -manager_la_LIBADD = $(progs_ldadd) -manager_la_LDFLAGS = -no-undefined -module -avoid-version -manager_la_LIBTOOLFLAGS = --tag=disable-static - -EXTRA_DIST += \ - $(manager_la_VALASOURCES) \ - $(manager_la_SOURCES) \ + --pkg fsoaudio-2.0 \ $(NULL) - -CLEANFILES = \ - *.c \ - *.h \ - *.la \ - *.lo \ - $(NULL) - -MAINTAINERCLEANFILES = \ - Makefile.in \ - $(NULL) +manager_la_CPPFLAGS = \ + -I$(top_srcdir)/src/lib \ + $(FSO_GLIB_CFLAGS) \ + $(FSO_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GEE_CFLAGS) \ + $(NULL) +manager_la_LIBADD = \ + $(FSO_GLIB_LIBS) \ + $(FSO_LIBS) \ + $(GLIB_LIBS) \ + $(GEE_LIBS) \ + $(top_builddir)/src/lib/libfsoaudio.la \ + $(NULL) +manager_la_LDFLAGS = -no-undefined -module -avoid-version +# manager_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/fsoaudiod/src/plugins/router_alsa/Makefile.am b/fsoaudiod/src/plugins/router_alsa/Makefile.am index 5987b036..3a00c82a 100644 --- a/fsoaudiod/src/plugins/router_alsa/Makefile.am +++ b/fsoaudiod/src/plugins/router_alsa/Makefile.am @@ -1,24 +1,21 @@ include $(top_srcdir)/Makefile.decl NULL = -AM_CFLAGS = \ - -I$(top_srcdir)/src/lib \ - $(FSO_GLIB_CFLAGS) \ - $(FSO_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(GEE_CFLAGS) \ +AM_CPPFLAGS = \ + -include $(CONFIG_HEADER) \ + -DG_LOG_DOMAIN=\"fsoaudio\" \ $(NULL) +AM_VALAFLAGS = -noinst_PROGRAMS = $(TEST_PROGS) - -progs_ldadd = \ - $(FSO_GLIB_LIBS) \ - $(FSO_LIBS) \ - $(GLIB_LIBS) \ - $(GEE_LIBS) \ - $(top_builddir)/src/lib/libfsoaudio.la +if WANT_DEBUG +AM_VALAFLAGS += -g -D DEBUG +AM_CPPFLAGS += -ggdb -O0 +endif -VALAC_ARGS = \ +modlibexecdir = $(libdir)/cornucopia/modules/fsoaudio +modlibexec_LTLIBRARIES = router_alsa.la +router_alsa_la_SOURCES = plugin.vala +router_alsa_la_VALAFLAGS = \ --basedir $(top_srcdir) \ --vapidir $(top_srcdir)/src/lib \ --vapidir $(top_srcdir)/vapi \ @@ -26,39 +23,21 @@ VALAC_ARGS = \ --pkg gee-1.0 \ --pkg fso-glib-1.0 \ --pkg fsoframework-2.0 \ - --pkg fsoaudio-2.0 - -if WANT_DEBUG -VALAC_ARGS += -g -D DEBUG -AM_CFLAGS += -ggdb -O0 -endif - -# -# plugin -# -modlibexecdir = $(libdir)/cornucopia/modules/fsoaudio -modlibexec_LTLIBRARIES = router_alsa.la -router_alsa_la_SOURCES = plugin.c -router_alsa_la_VALASOURCES = plugin.vala -$(router_alsa_la_SOURCES): $(router_alsa_la_VALASOURCES) - $(VALAC) -C $(VALAC_ARGS) $^ - touch $@ -router_alsa_la_LIBADD = $(progs_ldadd) -router_alsa_la_LDFLAGS = -no-undefined -module -avoid-version -router_alsa_la_LIBTOOLFLAGS = --tag=disable-static - -EXTRA_DIST += \ - $(router_alsa_la_VALASOURCES) \ - $(router_alsa_la_SOURCES) \ + --pkg fsoaudio-2.0 \ $(NULL) - -CLEANFILES = \ - *.c \ - *.h \ - *.la \ - *.lo \ - $(NULL) - -MAINTAINERCLEANFILES = \ - Makefile.in \ - $(NULL) +router_alsa_la_CPPFLAGS = \ + -I$(top_srcdir)/src/lib \ + $(FSO_GLIB_CFLAGS) \ + $(FSO_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GEE_CFLAGS) \ + $(NULL) +router_alsa_la_LIBADD = \ + $(FSO_GLIB_LIBS) \ + $(FSO_LIBS) \ + $(GLIB_LIBS) \ + $(GEE_LIBS) \ + $(top_builddir)/src/lib/libfsoaudio.la \ + $(NULL) +router_alsa_la_LDFLAGS = -no-undefined -module -avoid-version +# router_alsa_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/fsoaudiod/src/plugins/router_palmpre/Makefile.am b/fsoaudiod/src/plugins/router_palmpre/Makefile.am index 55c6842a..24a5199f 100644 --- a/fsoaudiod/src/plugins/router_palmpre/Makefile.am +++ b/fsoaudiod/src/plugins/router_palmpre/Makefile.am @@ -1,64 +1,43 @@ include $(top_srcdir)/Makefile.decl NULL = -AM_CFLAGS = \ +AM_CPPFLAGS = \ + -include $(CONFIG_HEADER) \ + -DG_LOG_DOMAIN=\"fsoaudio\" \ + $(NULL) +AM_VALAFLAGS = + +if WANT_DEBUG +AM_VALAFLAGS += -g -D DEBUG +AM_CPPFLAGS += -ggdb -O0 +endif + +modlibexecdir = $(libdir)/cornucopia/modules/fsoaudio +modlibexec_LTLIBRARIES = router_palmpre.la +router_palmpre_la_SOURCES = plugin.vala +router_palmpre_la_VALAFLAGS = \ + --basedir $(top_srcdir) \ + --vapidir $(top_srcdir)/src/lib \ + --vapidir $(top_srcdir)/vapi \ + --pkg glib-2.0 \ + --pkg gee-1.0 \ + --pkg fso-glib-1.0 \ + --pkg fsoframework-2.0 \ + --pkg fsoaudio-2.0 \ + $(NULL) +router_palmpre_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ $(FSO_GLIB_CFLAGS) \ $(FSO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ $(NULL) - -noinst_PROGRAMS = $(TEST_PROGS) - -progs_ldadd = \ +router_palmpre_la_LIBADD = \ $(FSO_GLIB_LIBS) \ $(FSO_LIBS) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ $(top_builddir)/src/lib/libfsoaudio.la - -VALAC_ARGS = \ - --basedir $(top_srcdir) \ - --vapidir $(top_srcdir)/src/lib \ - --vapidir $(top_srcdir)/vapi \ - --pkg glib-2.0 \ - --pkg gee-1.0 \ - --pkg fso-glib-1.0 \ - --pkg fsoframework-2.0 \ - --pkg fsoaudio-2.0 - -if WANT_DEBUG -VALAC_ARGS += -g -D DEBUG -AM_CFLAGS += -ggdb -O0 -endif - -# -# plugin -# -modlibexecdir = $(libdir)/cornucopia/modules/fsoaudio -modlibexec_LTLIBRARIES = router_palmpre.la -router_palmpre_la_SOURCES = plugin.c -router_palmpre_la_VALASOURCES = plugin.vala -$(router_palmpre_la_SOURCES): $(router_palmpre_la_VALASOURCES) - $(VALAC) -C $(VALAC_ARGS) $^ - touch $@ -router_palmpre_la_LIBADD = $(progs_ldadd) -router_palmpre_la_LDFLAGS = -no-undefined -module -avoid-version -router_palmpre_la_LIBTOOLFLAGS = --tag=disable-static - -EXTRA_DIST += \ - $(router_palmpre_la_VALASOURCES) \ - $(router_palmpre_la_SOURCES) \ $(NULL) - -CLEANFILES = \ - *.c \ - *.h \ - *.la \ - *.lo \ - $(NULL) - -MAINTAINERCLEANFILES = \ - Makefile.in \ - $(NULL) +router_palmpre_la_LDFLAGS = -no-undefined -module -avoid-version +# router_palmpre_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/fsoaudiod/src/plugins/sessionpolicy_default/Makefile.am b/fsoaudiod/src/plugins/sessionpolicy_default/Makefile.am index eb38b19e..48de9f33 100644 --- a/fsoaudiod/src/plugins/sessionpolicy_default/Makefile.am +++ b/fsoaudiod/src/plugins/sessionpolicy_default/Makefile.am @@ -1,24 +1,21 @@ include $(top_srcdir)/Makefile.decl NULL = -AM_CFLAGS = \ - -I$(top_srcdir)/src/lib \ - $(FSO_GLIB_CFLAGS) \ - $(FSO_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(GEE_CFLAGS) \ +AM_CPPFLAGS = \ + -include $(CONFIG_HEADER) \ + -DG_LOG_DOMAIN=\"fsoaudio\" \ $(NULL) +AM_VALAFLAGS = -noinst_PROGRAMS = $(TEST_PROGS) - -progs_ldadd = \ - $(FSO_GLIB_LIBS) \ - $(FSO_LIBS) \ - $(GLIB_LIBS) \ - $(GEE_LIBS) \ - $(top_builddir)/src/lib/libfsoaudio.la +if WANT_DEBUG +AM_VALAFLAGS += -g -D DEBUG +AM_CPPFLAGS += -ggdb -O0 +endif -VALAC_ARGS = \ +modlibexecdir = $(libdir)/cornucopia/modules/fsoaudio +modlibexec_LTLIBRARIES = sessionpolicy_default.la +sessionpolicy_default_la_SOURCES = plugin.vala +sessionpolicy_default_la_VALAFLAGS = \ --basedir $(top_srcdir) \ --vapidir $(top_srcdir)/src/lib \ --vapidir $(top_srcdir)/vapi \ @@ -27,38 +24,20 @@ VALAC_ARGS = \ --pkg fso-glib-1.0 \ --pkg fsoframework-2.0 \ --pkg fsoaudio-2.0 - -if WANT_DEBUG -VALAC_ARGS += -g -D DEBUG -AM_CFLAGS += -ggdb -O0 -endif - -# -# plugin -# -modlibexecdir = $(libdir)/cornucopia/modules/fsoaudio -modlibexec_LTLIBRARIES = sessionpolicy_default.la -sessionpolicy_default_la_SOURCES = plugin.c -sessionpolicy_default_la_VALASOURCES = plugin.vala -$(sessionpolicy_default_la_SOURCES): $(sessionpolicy_default_la_VALASOURCES) - $(VALAC) -C $(VALAC_ARGS) $^ - touch $@ -sessionpolicy_default_la_LIBADD = $(progs_ldadd) -sessionpolicy_default_la_LDFLAGS = -no-undefined -module -avoid-version -sessionpolicy_default_la_LIBTOOLFLAGS = --tag=disable-static - -EXTRA_DIST += \ - $(sessionpolicy_default_la_VALASOURCES) \ - $(sessionpolicy_default_la_SOURCES) \ $(NULL) - -CLEANFILES = \ - *.c \ - *.h \ - *.la \ - *.lo \ - $(NULL) - -MAINTAINERCLEANFILES = \ - Makefile.in \ - $(NULL) +sessionpolicy_default_la_CPPFLAGS = \ + -I$(top_srcdir)/src/lib \ + $(FSO_GLIB_CFLAGS) \ + $(FSO_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GEE_CFLAGS) \ + $(NULL) +sessionpolicy_default_la_LIBADD = \ + $(FSO_GLIB_LIBS) \ + $(FSO_LIBS) \ + $(GLIB_LIBS) \ + $(GEE_LIBS) \ + $(top_builddir)/src/lib/libfsoaudio.la + $(NULL) +sessionpolicy_default_la_LDFLAGS = -no-undefined -module -avoid-version +# sessionpolicy_default_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/fsoaudiod/src/plugins/streamcontrol_alsa/Makefile.am b/fsoaudiod/src/plugins/streamcontrol_alsa/Makefile.am index f6724255..4fb13c27 100644 --- a/fsoaudiod/src/plugins/streamcontrol_alsa/Makefile.am +++ b/fsoaudiod/src/plugins/streamcontrol_alsa/Makefile.am @@ -1,24 +1,21 @@ include $(top_srcdir)/Makefile.decl NULL = -AM_CFLAGS = \ - -I$(top_srcdir)/src/lib \ - $(FSO_GLIB_CFLAGS) \ - $(FSO_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(GEE_CFLAGS) \ +AM_CPPFLAGS = \ + -include $(CONFIG_HEADER) \ + -DG_LOG_DOMAIN=\"fsoaudio\" \ $(NULL) +AM_VALAFLAGS = -noinst_PROGRAMS = $(TEST_PROGS) - -progs_ldadd = \ - $(FSO_GLIB_LIBS) \ - $(FSO_LIBS) \ - $(GLIB_LIBS) \ - $(GEE_LIBS) \ - $(top_builddir)/src/lib/libfsoaudio.la +if WANT_DEBUG +AM_VALAFLAGS += -g -D DEBUG +AM_CPPFLAGS += -ggdb -O0 +endif -VALAC_ARGS = \ +modlibexecdir = $(libdir)/cornucopia/modules/fsoaudio +modlibexec_LTLIBRARIES = streamcontrol_alsa.la +streamcontrol_alsa_la_SOURCES = plugin.vala +streamcontrol_alsa_la_VALAFLAGS = \ --basedir $(top_srcdir) \ --vapidir $(top_srcdir)/src/lib \ --vapidir $(top_srcdir)/vapi \ @@ -26,39 +23,21 @@ VALAC_ARGS = \ --pkg gee-1.0 \ --pkg fso-glib-1.0 \ --pkg fsoframework-2.0 \ - --pkg fsoaudio-2.0 - -if WANT_DEBUG -VALAC_ARGS += -g -D DEBUG -AM_CFLAGS += -ggdb -O0 -endif - -# -# plugin -# -modlibexecdir = $(libdir)/cornucopia/modules/fsoaudio -modlibexec_LTLIBRARIES = streamcontrol_alsa.la -streamcontrol_alsa_la_SOURCES = plugin.c -streamcontrol_alsa_la_VALASOURCES = plugin.vala -$(streamcontrol_alsa_la_SOURCES): $(streamcontrol_alsa_la_VALASOURCES) - $(VALAC) -C $(VALAC_ARGS) $^ - touch $@ -streamcontrol_alsa_la_LIBADD = $(progs_ldadd) -streamcontrol_alsa_la_LDFLAGS = -no-undefined -module -avoid-version -streamcontrol_alsa_la_LIBTOOLFLAGS = --tag=disable-static - -EXTRA_DIST += \ - $(streamcontrol_alsa_la_VALASOURCES) \ - $(streamcontrol_alsa_la_SOURCES) \ + --pkg fsoaudio-2.0 \ $(NULL) - -CLEANFILES = \ - *.c \ - *.h \ - *.la \ - *.lo \ - $(NULL) - -MAINTAINERCLEANFILES = \ - Makefile.in \ - $(NULL) +streamcontrol_alsa_la_CPPFLAGS = \ + -I$(top_srcdir)/src/lib \ + $(FSO_GLIB_CFLAGS) \ + $(FSO_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GEE_CFLAGS) \ + $(NULL) +streamcontrol_alsa_la_LIBADD = \ + $(FSO_GLIB_LIBS) \ + $(FSO_LIBS) \ + $(GLIB_LIBS) \ + $(GEE_LIBS) \ + $(top_builddir)/src/lib/libfsoaudio.la \ + $(NULL) +streamcontrol_alsa_la_LDFLAGS = -no-undefined -module -avoid-version +# streamcontrol_alsa_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/fsoaudiod/src/plugins/system_integration/Makefile.am b/fsoaudiod/src/plugins/system_integration/Makefile.am index 71ecd1b6..2faa4d7d 100644 --- a/fsoaudiod/src/plugins/system_integration/Makefile.am +++ b/fsoaudiod/src/plugins/system_integration/Makefile.am @@ -1,24 +1,21 @@ include $(top_srcdir)/Makefile.decl NULL = -AM_CFLAGS = \ - -I$(top_srcdir)/src/lib \ - $(FSO_GLIB_CFLAGS) \ - $(FSO_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(GEE_CFLAGS) \ +AM_CPPFLAGS = \ + -include $(CONFIG_HEADER) \ + -DG_LOG_DOMAIN=\"fsoaudio\" \ $(NULL) +AM_VALAFLAGS = -noinst_PROGRAMS = $(TEST_PROGS) - -progs_ldadd = \ - $(FSO_GLIB_LIBS) \ - $(FSO_LIBS) \ - $(GLIB_LIBS) \ - $(GEE_LIBS) \ - $(top_builddir)/src/lib/libfsoaudio.la +if WANT_DEBUG +AM_VALAFLAGS += -g -D DEBUG +AM_CPPFLAGS += -ggdb -O0 +endif -VALAC_ARGS = \ +modlibexecdir = $(libdir)/cornucopia/modules/fsoaudio +modlibexec_LTLIBRARIES = system_integration.la +system_integration_la_SOURCES = plugin.vala +system_integration_la_VALAFLAGS = \ --basedir $(top_srcdir) \ --vapidir $(top_srcdir)/src/lib \ --vapidir $(top_srcdir)/vapi \ @@ -26,39 +23,21 @@ VALAC_ARGS = \ --pkg gee-1.0 \ --pkg fso-glib-1.0 \ --pkg fsoframework-2.0 \ - --pkg fsoaudio-2.0 - -if WANT_DEBUG -VALAC_ARGS += -g -D DEBUG -AM_CFLAGS += -ggdb -O0 -endif - -# -# plugin -# -modlibexecdir = $(libdir)/cornucopia/modules/fsoaudio -modlibexec_LTLIBRARIES = system_integration.la -system_integration_la_SOURCES = plugin.c -system_integration_la_VALASOURCES = plugin.vala -$(system_integration_la_SOURCES): $(system_integration_la_VALASOURCES) - $(VALAC) -C $(VALAC_ARGS) $^ - touch $@ -system_integration_la_LIBADD = $(progs_ldadd) -system_integration_la_LDFLAGS = -no-undefined -module -avoid-version -system_integration_la_LIBTOOLFLAGS = --tag=disable-static - -EXTRA_DIST += \ - $(system_integration_la_VALASOURCES) \ - $(system_integration_la_SOURCES) \ + --pkg fsoaudio-2.0 \ $(NULL) - -CLEANFILES = \ - *.c \ - *.h \ - *.la \ - *.lo \ - $(NULL) - -MAINTAINERCLEANFILES = \ - Makefile.in \ - $(NULL) +system_integration_la_CPPFLAGS = \ + -I$(top_srcdir)/src/lib \ + $(FSO_GLIB_CFLAGS) \ + $(FSO_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GEE_CFLAGS) \ + $(NULL) +system_integration_la_LIBADD = \ + $(FSO_GLIB_LIBS) \ + $(FSO_LIBS) \ + $(GLIB_LIBS) \ + $(GEE_LIBS) \ + $(top_builddir)/src/lib/libfsoaudio.la \ + $(NULL) +system_integration_la_LDFLAGS = -no-undefined -module -avoid-version +# system_integration_la_LIBTOOLFLAGS = --tag=disable-static |