From eab2ebe5b34569ada5f5fda64b9e313b1d9cccca Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 22 Sep 2010 11:42:39 -0500 Subject: Adding a new library line for configure so that we don't end up with extra libs in the library. --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 1c4e7ae..091f0f2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -108,12 +108,12 @@ libappindicator_la_LDFLAGS = \ -export-symbols-regex "^[^_d].*" libappindicator_la_CFLAGS = \ - $(INDICATOR_CFLAGS) \ + $(LIBRARY_CFLAGS) \ -Wall -Werror \ -DG_LOG_DOMAIN=\"libappindicator\" libappindicator_la_LIBADD = \ - $(INDICATOR_LIBS) + $(LIBRARY_LIBS) ################################## # DBus Specs -- cgit v1.2.3 From e1a62d349773dcda39e65fac9698f21c0f331e45 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 2 Dec 2010 14:46:50 -0600 Subject: Dropping the service and indicator files --- src/Makefile.am | 62 --------------------------------------------------------- 1 file changed, 62 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 091f0f2..c85f0e8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,65 +6,6 @@ EXTRA_DIST = appindicator-0.1.pc.in include $(top_srcdir)/Makefile.am.enum include $(top_srcdir)/Makefile.am.marshal -################################## -# Indicator -################################## - -applicationlibdir = $(INDICATORDIR) -applicationlib_LTLIBRARIES = libapplication.la -libapplication_la_SOURCES = \ - application-service-marshal.c \ - dbus-shared.h \ - indicator-application.c -libapplication_la_CFLAGS = $(INDICATOR_CFLAGS) \ - -Wall \ - -Wl,-Bsymbolic-functions \ - -Wl,-z,defs \ - -Wl,--as-needed \ - -Werror \ - -DG_LOG_DOMAIN=\"Indicator-Application\" -libapplication_la_LIBADD = $(INDICATOR_LIBS) -libapplication_la_LDFLAGS = -module -avoid-version - -################################## -# Service -################################## - -libexec_PROGRAMS = indicator-application-service - -BUILT_SOURCES += \ - application-service-server.h \ - application-service-marshal.h \ - application-service-marshal.c \ - dbus-properties-client.h \ - notification-item-client.h \ - notification-watcher-server.h - -indicator_application_service_SOURCES = \ - application-service.c \ - application-service-appstore.h \ - application-service-appstore.c \ - application-service-marshal.c \ - application-service-watcher.h \ - application-service-watcher.c \ - app-indicator-enum-types.c \ - dbus-shared.h \ - generate-id.h \ - generate-id.c - -indicator_application_service_CFLAGS = \ - $(INDICATOR_CFLAGS) \ - -DDATADIR="\"$(pkgdatadir)\"" \ - -Wall -Werror \ - -DG_LOG_DOMAIN=\"indicator-application-service\" - -indicator_application_service_LDADD = \ - $(INDICATOR_LIBS) \ - libappindicator.la - -glib_marshal_list = application-service-marshal.list -glib_marshal_prefix = _application_service_marshal - ################################## # Library ################################## @@ -120,9 +61,6 @@ libappindicator_la_LIBADD = \ ################################## DBUS_SPECS = \ - dbus-properties.xml \ - application-service.xml \ - notification-approver.xml \ notification-item.xml \ notification-watcher.xml -- cgit v1.2.3 From 7123c74faabca0af8fbe51eb74ec8b310b6ba20a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 2 Dec 2010 14:49:54 -0600 Subject: Adding back in the support for generating marshallers --- src/Makefile.am | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index c85f0e8..b1353a0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,6 +6,17 @@ EXTRA_DIST = appindicator-0.1.pc.in include $(top_srcdir)/Makefile.am.enum include $(top_srcdir)/Makefile.am.marshal +################################## +# Marshallers +################################## + +BUILT_SOURCES += \ + application-service-marshal.h \ + application-service-marshal.c + +glib_marshal_list = application-service-marshal.list +glib_marshal_prefix = _application_service_marshal + ################################## # Library ################################## -- cgit v1.2.3 From dd21c709028f6f1b96f702713acef3ac79f82f81 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 2 Dec 2010 14:55:10 -0600 Subject: Changing more of the bulid directives over to be library based --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index b1353a0..e591129 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -118,7 +118,7 @@ AppIndicator-0.1.gir: libappindicator.la $(glib_enum_h) AppIndicator_0_1_gir_INCLUDES = \ GObject-2.0 \ Gtk-2.0 -AppIndicator_0_1_gir_CFLAGS = $(INDICATOR_CFLAGS) -I$(srcdir) -I$(top_builddir)/src +AppIndicator_0_1_gir_CFLAGS = $(LIBRARY_CFLAGS) -I$(srcdir) -I$(top_builddir)/src AppIndicator_0_1_gir_LIBS = libappindicator.la AppIndicator_0_1_gir_FILES = $(introspection_sources) -- cgit v1.2.3 From d2a48b2530f5218ca71673ab072b707e374ad0c6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 2 Dec 2010 15:17:54 -0600 Subject: Oops, someone has to bring dbus-shared.h into the tarball now --- src/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index e591129..dc81059 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -51,6 +51,7 @@ libappindicator_la_SOURCES = \ app-indicator-enum-types.c \ app-indicator.c \ application-service-marshal.c \ + dbus-shared.h \ generate-id.h \ generate-id.c -- cgit v1.2.3 From 2209cb8604a929a6f1af5cec4991388ad32a7d1c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 6 Dec 2010 09:50:21 -0600 Subject: Changing to not use the dbus binding tool but to instead turn the XML files into pseudo-C --- src/Makefile.am | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 073fc41..ce83951 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -54,10 +54,6 @@ libappindicatorinclude_HEADERS = \ $(libappindicator_headers) \ $(glib_enum_h) -BUILT_SOURCES += \ - notification-watcher-client.h \ - notification-item-server.h - libappindicator_la_SOURCES = \ $(libappindicator_headers) \ app-indicator-enum-types.c \ @@ -65,7 +61,11 @@ libappindicator_la_SOURCES = \ application-service-marshal.c \ dbus-shared.h \ generate-id.h \ - generate-id.c + generate-id.c \ + notification-item.xml.h \ + notification-item.xml.c \ + notification-watcher.xml.h \ + notification-watcher.xml.c libappindicator_la_LDFLAGS = \ -version-info 1:0:0 \ @@ -99,25 +99,17 @@ DBUS_SPECS = \ notification-item.xml \ notification-watcher.xml -%-client.h: %.xml - dbus-binding-tool \ - --prefix=_$(notdir $(subst -,_,$(<:.xml=)))_client \ - --mode=glib-client \ - --output=$@ \ - $< - -%-server.h: %.xml - dbus-binding-tool \ - --prefix=_$(notdir $(subst -,_,$(<:.xml=)))_server \ - --mode=glib-server \ - --output=$@ \ - $< +%.xml.h: %.xml + echo "extern const char * $(subst -,_,$(subst .,_,$(basename $@)));" > $@ -BUILT_SOURCES += \ - $(DBUS_SPECS:.xml=-client.h) \ - $(DBUS_SPECS:.xml=-server.h) +%.xml.c: %.xml + echo "const char * $(subst -,_,$(subst .,_,$(basename $@))) = " > $@ + sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@ + echo ";" >> $@ -CLEANFILES += $(BUILT_SOURCES) +CLEANFILES += \ + $(DBUS_SPECS:.xml=.xml.h) \ + $(DBUS_SPECS:.xml=.xml.c) EXTRA_DIST += $(DBUS_SPECS) -- cgit v1.2.3 From f590403207e1f675983c90188c1d8d24ebb1d0c1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 6 Dec 2010 10:07:01 -0600 Subject: Entirely unsure why this makes things better, but well, it does. --- src/Makefile.am | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index ce83951..673938b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -100,12 +100,20 @@ DBUS_SPECS = \ notification-watcher.xml %.xml.h: %.xml - echo "extern const char * $(subst -,_,$(subst .,_,$(basename $@)));" > $@ + @echo "Building $@ from $<" + @echo "extern const char * $(subst -,_,$(subst .,_,$(basename $@)));" > $@ %.xml.c: %.xml - echo "const char * $(subst -,_,$(subst .,_,$(basename $@))) = " > $@ - sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@ - echo ";" >> $@ + @echo "Building $@ from $<" + @echo "const char * $(subst -,_,$(subst .,_,$(basename $@))) = " > $@ + @sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@ + @echo ";" >> $@ + +BUILT_SOURCES += \ + notification-item.xml.c \ + notification-item.xml.h \ + notification-watcher.xml.c \ + notification-watcher.xml.h CLEANFILES += \ $(DBUS_SPECS:.xml=.xml.h) \ -- cgit v1.2.3 From 07aeca3802b2e19878b24637f1f73d971c7be101 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 6 Dec 2010 16:38:29 -0600 Subject: Switching the names of the generated files to stop automake from thinking it needs to build the XML files. --- src/Makefile.am | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 673938b..5b6adc2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -62,10 +62,10 @@ libappindicator_la_SOURCES = \ dbus-shared.h \ generate-id.h \ generate-id.c \ - notification-item.xml.h \ - notification-item.xml.c \ - notification-watcher.xml.h \ - notification-watcher.xml.c + gen-notification-item.xml.h \ + gen-notification-item.xml.c \ + gen-notification-watcher.xml.h \ + gen-notification-watcher.xml.c libappindicator_la_LDFLAGS = \ -version-info 1:0:0 \ @@ -99,25 +99,27 @@ DBUS_SPECS = \ notification-item.xml \ notification-watcher.xml -%.xml.h: %.xml +gen-%.xml.h: %.xml @echo "Building $@ from $<" - @echo "extern const char * $(subst -,_,$(subst .,_,$(basename $@)));" > $@ + @echo "extern const char * $(subst -,_,$(subst .,_,$(basename $<)));" > $@ -%.xml.c: %.xml +gen-%.xml.c: %.xml @echo "Building $@ from $<" - @echo "const char * $(subst -,_,$(subst .,_,$(basename $@))) = " > $@ + @echo "const char * $(subst -,_,$(subst .,_,$(basename $<))) = " > $@ @sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@ @echo ";" >> $@ BUILT_SOURCES += \ - notification-item.xml.c \ - notification-item.xml.h \ - notification-watcher.xml.c \ - notification-watcher.xml.h + gen-notification-item.xml.c \ + gen-notification-item.xml.h \ + gen-notification-watcher.xml.c \ + gen-notification-watcher.xml.h CLEANFILES += \ - $(DBUS_SPECS:.xml=.xml.h) \ - $(DBUS_SPECS:.xml=.xml.c) + gen-notification-item.xml.c \ + gen-notification-item.xml.h \ + gen-notification-watcher.xml.c \ + gen-notification-watcher.xml.h EXTRA_DIST += $(DBUS_SPECS) -- cgit v1.2.3 From 41edd6b1dd171d887fe6bc860a1451358b630add Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 11:00:54 -0600 Subject: Adding in some '_' so that the symbols don't get exported in the library. --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 5b6adc2..a5ea29b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -101,11 +101,11 @@ DBUS_SPECS = \ gen-%.xml.h: %.xml @echo "Building $@ from $<" - @echo "extern const char * $(subst -,_,$(subst .,_,$(basename $<)));" > $@ + @echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $<)));" > $@ gen-%.xml.c: %.xml @echo "Building $@ from $<" - @echo "const char * $(subst -,_,$(subst .,_,$(basename $<))) = " > $@ + @echo "const char * _$(subst -,_,$(subst .,_,$(basename $<))) = " > $@ @sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@ @echo ";" >> $@ -- cgit v1.2.3