From bd87193c1ee736a5ffa217a710996e4afd3f3b47 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 3 Dec 2020 11:35:51 +0100 Subject: src/libayatana-ido.h: Include internal APIs from the local directory (i.e. the same dir where libayatana-ido.h is located). --- src/libayatana-ido.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/libayatana-ido.h b/src/libayatana-ido.h index 37a2eee..7eb8ae1 100644 --- a/src/libayatana-ido.h +++ b/src/libayatana-ido.h @@ -26,9 +26,9 @@ #ifndef __IDO__ #define __IDO__ -#include -#include -#include +#include "idocalendarmenuitem.h" +#include "idoscalemenuitem.h" +#include "idoentrymenuitem.h" void ido_init (void); -- cgit v1.2.3 From 5307fc84a25f745fac945e579c8b01288fd8279d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 3 Dec 2020 11:40:03 +0100 Subject: src/Makefile.am: Merge old 'INCLUDES =' and 'AM_CPPFLAGS =' values (and beautify the TAB'bing). --- src/Makefile.am | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 12a11c3..cc583c5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -52,24 +52,24 @@ idotypebuiltins.c: stamp-idotypebuiltins.h $(sources_h) ) > xgen-gtbc \ && cp xgen-gtbc idotypebuiltins.c && rm -f xgen-gtbc -INCLUDES = \ - -I$(srcdir) \ - -I$(top_srcdir) \ - -DG_LOG_DOMAIN=\"IDO\" \ - -DPREFIX=\"$(prefix)"\" \ - -DLIBDIR=\"$(libdir)"\" \ - -DG_DISABLE_DEPRECATED \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED - -AM_CPPFLAGS = \ - $(GCC_FLAGS) \ - $(GTK_CFLAGS) \ - $(MAINTAINER_CFLAGS) \ - -Wall -Wextra -Wno-unused-parameter -Wno-error=deprecated-declarations - -AM_CFLAGS = \ - $(COVERAGE_CFLAGS) +AM_CPPFLAGS = \ + -I$(srcdir) \ + -I$(top_srcdir) \ + -DG_LOG_DOMAIN=\"IDO\" \ + -DPREFIX=\"$(prefix)"\" \ + -DLIBDIR=\"$(libdir)"\" \ + -DG_DISABLE_DEPRECATED \ + -DGDK_PIXBUF_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ + $(GCC_FLAGS) \ + $(GTK_CFLAGS) \ + $(MAINTAINER_CFLAGS) \ + -Wall -Wextra -Wno-unused-parameter -Wno-error=deprecated-declarations \ + $(NULL) + +AM_CFLAGS = \ + $(COVERAGE_CFLAGS) \ + $(NULL) libayatana_ido_0_4_la_SOURCES = \ ayatanamenuitemfactory.c \ -- cgit v1.2.3 From d5fb21d8596ab963c76dd52357e9e6c16984024a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 3 Dec 2020 11:41:40 +0100 Subject: src/Makefile.am: Various TAB'bing fixes / beautifications. --- src/Makefile.am | 62 +++++++++++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 26 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index cc583c5..4cdf8d4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,5 @@ +NULL = + CLEANFILES = lib_LTLIBRARIES = libayatana-ido3-0.4.la @@ -7,7 +9,8 @@ ido_built_public_sources = \ stamp_files = \ idotypebuiltins.h \ - idotypebuiltins.c + idotypebuiltins.c \ + $(NULL) sources_h = \ ayatanamenuitemfactory.h \ @@ -20,7 +23,7 @@ sources_h = \ idousermenuitem.h \ idoappointmentmenuitem.h \ idobasicmenuitem.h \ - idoremovablemenuitem.h \ + idoremovablemenuitem.h \ idoprogressmenuitem.h \ idotimestampmenuitem.h \ idolocationmenuitem.h \ @@ -31,21 +34,23 @@ sources_h = \ idoplaybackmenuitem.h \ idoapplicationmenuitem.h \ idodetaillabel.h \ - idosourcemenuitem.h + idosourcemenuitem.h \ + $(NULL) EXTRA_DIST = \ ido.list \ idotypebuiltins.h.template \ - idotypebuiltins.c.template - + idotypebuiltins.c.template \ + $(NULL) idotypebuiltins.h: stamp-idotypebuiltins.h stamp-idotypebuiltins.h: $(sources_h) - ( cd $(srcdir) && $(GLIB_MKENUMS) --template idotypebuiltins.h.template \ - $(sources_h) ) >> xgen-gtbh \ - && (cmp -s xgen-gtbh idotypebuiltins.h || cp xgen-gtbh idotypebuiltins.h ) \ - && rm -f xgen-gtbh && echo timestamp > $(@F) + ( cd $(srcdir) && $(GLIB_MKENUMS) --template idotypebuiltins.h.template \ + $(sources_h) ) >> xgen-gtbh \ + && (cmp -s xgen-gtbh idotypebuiltins.h || cp xgen-gtbh idotypebuiltins.h ) \ + && rm -f xgen-gtbh && echo timestamp > $(@F) \ + $(NULL) idotypebuiltins.c: stamp-idotypebuiltins.h ( cd $(srcdir) && $(GLIB_MKENUMS) --template idotypebuiltins.c.template \ @@ -89,13 +94,14 @@ libayatana_ido_0_4_la_SOURCES = \ idoplaybackmenuitem.c \ idoappointmentmenuitem.c \ idobasicmenuitem.c \ - idoremovablemenuitem.c \ + idoremovablemenuitem.c \ idoprogressmenuitem.c \ idotimestampmenuitem.c \ idolocationmenuitem.c \ idoapplicationmenuitem.c \ idodetaillabel.c \ - idosourcemenuitem.c + idosourcemenuitem.c \ + $(NULL) libayatana_ido3_0_4_la_SOURCES = $(libayatana_ido_0_4_la_SOURCES) @@ -109,30 +115,34 @@ libayatana_idoinclude_HEADERS = \ idoscalemenuitem.h \ idoswitchmenuitem.h \ idotimeline.h \ - libayatana-ido.h + libayatana-ido.h \ + $(NULL) libayatana_ido_0_4_la_LIBADD = $(GTK_LIBS) $(LIBM) -libayatana_ido_0_4_la_LDFLAGS = \ - $(GTK_LT_LDFLAGS) \ - $(COVERAGE_LDFLAGS) \ - -no-undefined \ - -export-symbols-regex "^[^_].*" +libayatana_ido_0_4_la_LDFLAGS = \ + $(GTK_LT_LDFLAGS) \ + $(COVERAGE_LDFLAGS) \ + -no-undefined \ + -export-symbols-regex "^[^_].*" \ + $(NULL) + libayatana_ido3_0_4_la_LIBADD = $(libayatana_ido_0_4_la_LIBADD) -libayatana_ido3_0_4_la_LDFLAGS = \ - $(libayatana_ido_0_4_la_LDFLAGS) +libayatana_ido3_0_4_la_LDFLAGS = $(libayatana_ido_0_4_la_LDFLAGS) DISTCLEANFILES = \ Makefile.in \ stamp-idotypebuiltins.h \ idotypebuiltins.h \ - idotypebuiltins.c + idotypebuiltins.c \ + $(NULL) -include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = \ - --symbol-prefix=ido \ - --warn-all \ - --identifier-prefix=Ido +INTROSPECTION_SCANNER_ARGS = \ + --symbol-prefix=ido \ + --warn-all \ + --identifier-prefix=Ido \ + $(NULL) if HAVE_INTROSPECTION @@ -170,8 +180,8 @@ vapidir = $(datadir)/vala/vapi vapi_DATA = AyatanaIdo3-0.4.vapi AyatanaIdo3-0.4.vapi: AyatanaIdo3-0.4.gir - $(VALA_API_GEN) --library=AyatanaIdo3-0.4 \ - --pkg gtk+-3.0 \ + $(VALA_API_GEN) --library=AyatanaIdo3-0.4 \ + --pkg gtk+-3.0 \ $< CLEANFILES += $(vapi_DATA) -- cgit v1.2.3 From 385c79769f896bdc8cfe15f30113feef7776ee69 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 3 Dec 2020 11:42:50 +0100 Subject: src/Makefile.am: Split out all *.c files from libayatana_ido_0_4_la_SOURCES into sources_c variable. --- src/Makefile.am | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 4cdf8d4..4922125 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -77,6 +77,11 @@ AM_CFLAGS = \ $(NULL) libayatana_ido_0_4_la_SOURCES = \ + $(sources_h) \ + $(sources_c) \ + $(NULL) + +sources_c = \ ayatanamenuitemfactory.c \ libayatana-ido.c \ idotypebuiltins.c \ @@ -157,7 +162,9 @@ AyatanaIdo3_0_4_gir_FILES = \ idoscalemenuitem.h \ idoswitchmenuitem.h \ idotimeline.h \ - $(libayatana_ido_0_4_la_SOURCES) + $(sources_c) \ + $(NULL) + AyatanaIdo3_0_4_gir_NAMESPACE = AyatanaIdo3 AyatanaIdo3_0_4_gir_VERSION = 0.4 AyatanaIdo3_0_4_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS) -- cgit v1.2.3 From 9057543fd36120585540c014e17b1c075bca56c0 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 3 Dec 2020 11:43:37 +0100 Subject: src/Makefile.am: Move 'sources_c =' variable definition further up. --- src/Makefile.am | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 4922125..268e2fd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -37,6 +37,33 @@ sources_h = \ idosourcemenuitem.h \ $(NULL) +sources_c = \ + ayatanamenuitemfactory.c \ + libayatana-ido.c \ + idotypebuiltins.c \ + idocalendarmenuitem.c \ + idoalarmmenuitem.c \ + idoentrymenuitem.c \ + idorange.c \ + idoscalemenuitem.c \ + idoswitchmenuitem.c \ + idotimeline.c \ + idomenuitemfactory.c \ + idoactionhelper.c \ + idousermenuitem.c \ + idomediaplayermenuitem.c \ + idoplaybackmenuitem.c \ + idoappointmentmenuitem.c \ + idobasicmenuitem.c \ + idoremovablemenuitem.c \ + idoprogressmenuitem.c \ + idotimestampmenuitem.c \ + idolocationmenuitem.c \ + idoapplicationmenuitem.c \ + idodetaillabel.c \ + idosourcemenuitem.c \ + $(NULL) + EXTRA_DIST = \ ido.list \ idotypebuiltins.h.template \ @@ -81,33 +108,6 @@ libayatana_ido_0_4_la_SOURCES = \ $(sources_c) \ $(NULL) -sources_c = \ - ayatanamenuitemfactory.c \ - libayatana-ido.c \ - idotypebuiltins.c \ - idocalendarmenuitem.c \ - idoalarmmenuitem.c \ - idoentrymenuitem.c \ - idorange.c \ - idoscalemenuitem.c \ - idoswitchmenuitem.c \ - idotimeline.c \ - idomenuitemfactory.c \ - idoactionhelper.c \ - idousermenuitem.c \ - idomediaplayermenuitem.c \ - idoplaybackmenuitem.c \ - idoappointmentmenuitem.c \ - idobasicmenuitem.c \ - idoremovablemenuitem.c \ - idoprogressmenuitem.c \ - idotimestampmenuitem.c \ - idolocationmenuitem.c \ - idoapplicationmenuitem.c \ - idodetaillabel.c \ - idosourcemenuitem.c \ - $(NULL) - libayatana_ido3_0_4_la_SOURCES = $(libayatana_ido_0_4_la_SOURCES) libayatana_idoincludedir=$(includedir)/libayatana-ido3-0.4/libayatana-ido -- cgit v1.2.3