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(-) 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