diff options
author | Matthias Clasen <mclasen@redhat.com> | 2014-11-29 00:26:52 -0500 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2014-11-29 00:26:52 -0500 |
commit | f85093a13695f21ade5e3a6c1bc2d71eee4629c3 (patch) | |
tree | 42c0e35144708090fc92799102908dacb9b15224 /examples | |
parent | 6bf9d130419a446cd716e5bc1f4a214c489e3475 (diff) | |
download | gtk+-f85093a13695f21ade5e3a6c1bc2d71eee4629c3.tar.gz |
Beautify example Makefiles a bit
Diffstat (limited to 'examples')
-rw-r--r-- | examples/application1/Makefile.am | 21 | ||||
-rw-r--r-- | examples/application10/Makefile.am | 45 | ||||
-rw-r--r-- | examples/application2/Makefile.am | 27 | ||||
-rw-r--r-- | examples/application3/Makefile.am | 27 | ||||
-rw-r--r-- | examples/application4/Makefile.am | 29 | ||||
-rw-r--r-- | examples/application5/Makefile.am | 39 | ||||
-rw-r--r-- | examples/application6/Makefile.am | 43 | ||||
-rw-r--r-- | examples/application7/Makefile.am | 43 | ||||
-rw-r--r-- | examples/application8/Makefile.am | 45 | ||||
-rw-r--r-- | examples/application9/Makefile.am | 45 |
10 files changed, 177 insertions, 187 deletions
diff --git a/examples/application1/Makefile.am b/examples/application1/Makefile.am index 2bb45bbeac..114e204fa0 100644 --- a/examples/application1/Makefile.am +++ b/examples/application1/Makefile.am @@ -1,21 +1,20 @@ -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - $(GTK_DEBUG_FLAGS) \ +GTK_CFLAGS = \ + -I$(top_srcdir) \ $(GTK_DEP_CFLAGS) -LDADD = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ +GTK_LIBS = \ + $(top_builddir)/gtk/libgtk-3.la \ + $(top_builddir)/gdk/libgdk-3.la \ $(GTK_DEP_LIBS) noinst_PROGRAMS = exampleapp -exampleapp_SOURCES = \ - main.c \ - exampleapp.c exampleapp.h \ +exampleapp_CFLAGS = $(GTK_CFLAGS) +exampleapp_LDADD = $(GTK_LIBS) +exampleapp_SOURCES = \ + main.c \ + exampleapp.c exampleapp.h \ exampleappwin.c exampleappwin.h -include $(top_srcdir)/git.mk diff --git a/examples/application10/Makefile.am b/examples/application10/Makefile.am index c6eff7a5ff..5db103723e 100644 --- a/examples/application10/Makefile.am +++ b/examples/application10/Makefile.am @@ -1,34 +1,33 @@ -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - $(GTK_DEBUG_FLAGS) \ +GTK_CFLAGS = \ + -I$(top_srcdir) \ $(GTK_DEP_CFLAGS) -LDADD = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ +GTK_LIBS = \ + $(top_builddir)/gtk/libgtk-3.la \ + $(top_builddir)/gdk/libgdk-3.la \ $(GTK_DEP_LIBS) noinst_PROGRAMS = exampleapp -exampleapp_SOURCES = \ - main.c \ - exampleapp.c exampleapp.h \ - exampleappwin.c exampleappwin.h \ - exampleappprefs.c exampleappprefs.h \ +exampleapp_CFLAGS = $(GTK_CFLAGS) +exampleapp_LDADD = $(GTK_LIBS) +exampleapp_SOURCES = \ + main.c \ + exampleapp.c exampleapp.h \ + exampleappwin.c exampleappwin.h \ + exampleappprefs.c exampleappprefs.h \ resources.c -BUILT_SOURCES = \ - resources.c \ +BUILT_SOURCES = \ + resources.c \ gschemas.compiled resources.c: exampleapp.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/exampleapp.gresource.xml) $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \ --target=$@ --sourcedir=$(srcdir) --generate-source -gsettings_SCHEMAS = \ +gsettings_SCHEMAS = \ org.gtk.exampleapp.gschema.xml @GSETTINGS_RULES@ @@ -36,15 +35,15 @@ gsettings_SCHEMAS = \ gschemas.compiled: org.gtk.exampleapp.gschema.xml $(GLIB_COMPILE_SCHEMAS) . -EXTRA_DIST = \ - window.ui \ - app-menu.ui \ - prefs.ui \ - gears-menu.ui \ - exampleapp.gresource.xml \ +EXTRA_DIST = \ + window.ui \ + app-menu.ui \ + prefs.ui \ + gears-menu.ui \ + exampleapp.gresource.xml \ org.gtk.exampleapp.gschema.xml -CLEANFILES = \ +CLEANFILES = \ gschemas.compiled -include $(top_srcdir)/git.mk diff --git a/examples/application2/Makefile.am b/examples/application2/Makefile.am index 5155f9ff13..0ecba8a33f 100644 --- a/examples/application2/Makefile.am +++ b/examples/application2/Makefile.am @@ -1,22 +1,21 @@ -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - $(GTK_DEBUG_FLAGS) \ +GTK_CFLAGS = \ + -I$(top_srcdir) \ $(GTK_DEP_CFLAGS) -LDADD = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ +GTK_LIBS = \ + $(top_builddir)/gtk/libgtk-3.la \ + $(top_builddir)/gdk/libgdk-3.la \ $(GTK_DEP_LIBS) noinst_PROGRAMS = exampleapp -exampleapp_SOURCES = \ - main.c \ - exampleapp.c exampleapp.h \ - exampleappwin.c exampleappwin.h \ +exampleapp_CFLAGS = $(GTK_CFLAGS) +exampleapp_LDADD = $(GTK_LIBS) +exampleapp_SOURCES = \ + main.c \ + exampleapp.c exampleapp.h \ + exampleappwin.c exampleappwin.h \ resources.c BUILT_SOURCES = resources.c @@ -25,8 +24,8 @@ resources.c: exampleapp.gresource.xml window.ui $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \ --target=$@ --sourcedir=$(srcdir) --generate-source -EXTRA_DIST = \ - window.ui \ +EXTRA_DIST = \ + window.ui \ exampleapp.gresource.xml -include $(top_srcdir)/git.mk diff --git a/examples/application3/Makefile.am b/examples/application3/Makefile.am index 5155f9ff13..0ecba8a33f 100644 --- a/examples/application3/Makefile.am +++ b/examples/application3/Makefile.am @@ -1,22 +1,21 @@ -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - $(GTK_DEBUG_FLAGS) \ +GTK_CFLAGS = \ + -I$(top_srcdir) \ $(GTK_DEP_CFLAGS) -LDADD = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ +GTK_LIBS = \ + $(top_builddir)/gtk/libgtk-3.la \ + $(top_builddir)/gdk/libgdk-3.la \ $(GTK_DEP_LIBS) noinst_PROGRAMS = exampleapp -exampleapp_SOURCES = \ - main.c \ - exampleapp.c exampleapp.h \ - exampleappwin.c exampleappwin.h \ +exampleapp_CFLAGS = $(GTK_CFLAGS) +exampleapp_LDADD = $(GTK_LIBS) +exampleapp_SOURCES = \ + main.c \ + exampleapp.c exampleapp.h \ + exampleappwin.c exampleappwin.h \ resources.c BUILT_SOURCES = resources.c @@ -25,8 +24,8 @@ resources.c: exampleapp.gresource.xml window.ui $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \ --target=$@ --sourcedir=$(srcdir) --generate-source -EXTRA_DIST = \ - window.ui \ +EXTRA_DIST = \ + window.ui \ exampleapp.gresource.xml -include $(top_srcdir)/git.mk diff --git a/examples/application4/Makefile.am b/examples/application4/Makefile.am index 58bb805a08..c14a3cbcf1 100644 --- a/examples/application4/Makefile.am +++ b/examples/application4/Makefile.am @@ -1,22 +1,21 @@ -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - $(GTK_DEBUG_FLAGS) \ +GTK_CFLAGS = \ + -I$(top_srcdir) \ $(GTK_DEP_CFLAGS) -LDADD = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ +GTK_LIBS = \ + $(top_builddir)/gtk/libgtk-3.la \ + $(top_builddir)/gdk/libgdk-3.la \ $(GTK_DEP_LIBS) noinst_PROGRAMS = exampleapp -exampleapp_SOURCES = \ - main.c \ - exampleapp.c exampleapp.h \ - exampleappwin.c exampleappwin.h \ +exampleapp_CFLAGS = $(GTK_CFLAGS) +exampleapp_LDADD = $(GTK_LIBS) +exampleapp_SOURCES = \ + main.c \ + exampleapp.c exampleapp.h \ + exampleappwin.c exampleappwin.h \ resources.c BUILT_SOURCES = resources.c @@ -25,9 +24,9 @@ resources.c: exampleapp.gresource.xml window.ui app-menu.ui $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \ --target=$@ --sourcedir=$(srcdir) --generate-source -EXTRA_DIST = \ - window.ui \ - app-menu.ui \ +EXTRA_DIST = \ + window.ui \ + app-menu.ui \ exampleapp.gresource.xml -include $(top_srcdir)/git.mk diff --git a/examples/application5/Makefile.am b/examples/application5/Makefile.am index 5bc9cb182f..2b199f97d9 100644 --- a/examples/application5/Makefile.am +++ b/examples/application5/Makefile.am @@ -1,33 +1,32 @@ -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - $(GTK_DEBUG_FLAGS) \ +GTK_CFLAGS = \ + -I$(top_srcdir) \ $(GTK_DEP_CFLAGS) -LDADD = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ +GTK_LIBS = \ + $(top_builddir)/gtk/libgtk-3.la \ + $(top_builddir)/gdk/libgdk-3.la \ $(GTK_DEP_LIBS) noinst_PROGRAMS = exampleapp -exampleapp_SOURCES = \ - main.c \ - exampleapp.c exampleapp.h \ - exampleappwin.c exampleappwin.h \ +exampleapp_CFLAGS = $(GTK_CFLAGS) +exampleapp_LDADD = $(GTK_LIBS) +exampleapp_SOURCES = \ + main.c \ + exampleapp.c exampleapp.h \ + exampleappwin.c exampleappwin.h \ resources.c -BUILT_SOURCES = \ - resources.c \ +BUILT_SOURCES = \ + resources.c \ gschemas.compiled resources.c: exampleapp.gresource.xml window.ui app-menu.ui $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \ --target=$@ --sourcedir=$(srcdir) --generate-source -gsettings_SCHEMAS = \ +gsettings_SCHEMAS = \ org.gtk.exampleapp.gschema.xml @GSETTINGS_RULES@ @@ -35,13 +34,13 @@ gsettings_SCHEMAS = \ gschemas.compiled: org.gtk.exampleapp.gschema.xml $(GLIB_COMPILE_SCHEMAS) . -EXTRA_DIST = \ - window.ui \ - app-menu.ui \ - exampleapp.gresource.xml \ +EXTRA_DIST = \ + window.ui \ + app-menu.ui \ + exampleapp.gresource.xml \ org.gtk.exampleapp.gschema.xml -CLEANFILES = \ +CLEANFILES = \ gschemas.compiled -include $(top_srcdir)/git.mk diff --git a/examples/application6/Makefile.am b/examples/application6/Makefile.am index fd668eadb8..b8cff5b8fe 100644 --- a/examples/application6/Makefile.am +++ b/examples/application6/Makefile.am @@ -1,34 +1,33 @@ -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - $(GTK_DEBUG_FLAGS) \ +GTK_CFLAGS = \ + -I$(top_srcdir) \ $(GTK_DEP_CFLAGS) -LDADD = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ +GTK_LIBS = \ + $(top_builddir)/gtk/libgtk-3.la \ + $(top_builddir)/gdk/libgdk-3.la \ $(GTK_DEP_LIBS) noinst_PROGRAMS = exampleapp -exampleapp_SOURCES = \ - main.c \ - exampleapp.c exampleapp.h \ - exampleappwin.c exampleappwin.h \ - exampleappprefs.c exampleappprefs.h \ +exampleapp_CFLAGS = $(GTK_CFLAGS) +exampleapp_LDADD = $(GTK_LIBS) +exampleapp_SOURCES = \ + main.c \ + exampleapp.c exampleapp.h \ + exampleappwin.c exampleappwin.h \ + exampleappprefs.c exampleappprefs.h \ resources.c -BUILT_SOURCES = \ - resources.c \ +BUILT_SOURCES = \ + resources.c \ gschemas.compiled resources.c: exampleapp.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/exampleapp.gresource.xml) $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \ --target=$@ --sourcedir=$(srcdir) --generate-source -gsettings_SCHEMAS = \ +gsettings_SCHEMAS = \ org.gtk.exampleapp.gschema.xml @GSETTINGS_RULES@ @@ -36,14 +35,14 @@ gsettings_SCHEMAS = \ gschemas.compiled: org.gtk.exampleapp.gschema.xml $(GLIB_COMPILE_SCHEMAS) . -EXTRA_DIST = \ - window.ui \ - app-menu.ui \ - prefs.ui \ - exampleapp.gresource.xml \ +EXTRA_DIST = \ + window.ui \ + app-menu.ui \ + prefs.ui \ + exampleapp.gresource.xml \ org.gtk.exampleapp.gschema.xml -CLEANFILES = \ +CLEANFILES = \ gschemas.compiled -include $(top_srcdir)/git.mk diff --git a/examples/application7/Makefile.am b/examples/application7/Makefile.am index fd668eadb8..b8cff5b8fe 100644 --- a/examples/application7/Makefile.am +++ b/examples/application7/Makefile.am @@ -1,34 +1,33 @@ -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - $(GTK_DEBUG_FLAGS) \ +GTK_CFLAGS = \ + -I$(top_srcdir) \ $(GTK_DEP_CFLAGS) -LDADD = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ +GTK_LIBS = \ + $(top_builddir)/gtk/libgtk-3.la \ + $(top_builddir)/gdk/libgdk-3.la \ $(GTK_DEP_LIBS) noinst_PROGRAMS = exampleapp -exampleapp_SOURCES = \ - main.c \ - exampleapp.c exampleapp.h \ - exampleappwin.c exampleappwin.h \ - exampleappprefs.c exampleappprefs.h \ +exampleapp_CFLAGS = $(GTK_CFLAGS) +exampleapp_LDADD = $(GTK_LIBS) +exampleapp_SOURCES = \ + main.c \ + exampleapp.c exampleapp.h \ + exampleappwin.c exampleappwin.h \ + exampleappprefs.c exampleappprefs.h \ resources.c -BUILT_SOURCES = \ - resources.c \ +BUILT_SOURCES = \ + resources.c \ gschemas.compiled resources.c: exampleapp.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/exampleapp.gresource.xml) $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \ --target=$@ --sourcedir=$(srcdir) --generate-source -gsettings_SCHEMAS = \ +gsettings_SCHEMAS = \ org.gtk.exampleapp.gschema.xml @GSETTINGS_RULES@ @@ -36,14 +35,14 @@ gsettings_SCHEMAS = \ gschemas.compiled: org.gtk.exampleapp.gschema.xml $(GLIB_COMPILE_SCHEMAS) . -EXTRA_DIST = \ - window.ui \ - app-menu.ui \ - prefs.ui \ - exampleapp.gresource.xml \ +EXTRA_DIST = \ + window.ui \ + app-menu.ui \ + prefs.ui \ + exampleapp.gresource.xml \ org.gtk.exampleapp.gschema.xml -CLEANFILES = \ +CLEANFILES = \ gschemas.compiled -include $(top_srcdir)/git.mk diff --git a/examples/application8/Makefile.am b/examples/application8/Makefile.am index c6eff7a5ff..5db103723e 100644 --- a/examples/application8/Makefile.am +++ b/examples/application8/Makefile.am @@ -1,34 +1,33 @@ -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - $(GTK_DEBUG_FLAGS) \ +GTK_CFLAGS = \ + -I$(top_srcdir) \ $(GTK_DEP_CFLAGS) -LDADD = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ +GTK_LIBS = \ + $(top_builddir)/gtk/libgtk-3.la \ + $(top_builddir)/gdk/libgdk-3.la \ $(GTK_DEP_LIBS) noinst_PROGRAMS = exampleapp -exampleapp_SOURCES = \ - main.c \ - exampleapp.c exampleapp.h \ - exampleappwin.c exampleappwin.h \ - exampleappprefs.c exampleappprefs.h \ +exampleapp_CFLAGS = $(GTK_CFLAGS) +exampleapp_LDADD = $(GTK_LIBS) +exampleapp_SOURCES = \ + main.c \ + exampleapp.c exampleapp.h \ + exampleappwin.c exampleappwin.h \ + exampleappprefs.c exampleappprefs.h \ resources.c -BUILT_SOURCES = \ - resources.c \ +BUILT_SOURCES = \ + resources.c \ gschemas.compiled resources.c: exampleapp.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/exampleapp.gresource.xml) $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \ --target=$@ --sourcedir=$(srcdir) --generate-source -gsettings_SCHEMAS = \ +gsettings_SCHEMAS = \ org.gtk.exampleapp.gschema.xml @GSETTINGS_RULES@ @@ -36,15 +35,15 @@ gsettings_SCHEMAS = \ gschemas.compiled: org.gtk.exampleapp.gschema.xml $(GLIB_COMPILE_SCHEMAS) . -EXTRA_DIST = \ - window.ui \ - app-menu.ui \ - prefs.ui \ - gears-menu.ui \ - exampleapp.gresource.xml \ +EXTRA_DIST = \ + window.ui \ + app-menu.ui \ + prefs.ui \ + gears-menu.ui \ + exampleapp.gresource.xml \ org.gtk.exampleapp.gschema.xml -CLEANFILES = \ +CLEANFILES = \ gschemas.compiled -include $(top_srcdir)/git.mk diff --git a/examples/application9/Makefile.am b/examples/application9/Makefile.am index c6eff7a5ff..5db103723e 100644 --- a/examples/application9/Makefile.am +++ b/examples/application9/Makefile.am @@ -1,34 +1,33 @@ -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/gdk \ - -I$(top_builddir)/gdk \ - $(GTK_DEBUG_FLAGS) \ +GTK_CFLAGS = \ + -I$(top_srcdir) \ $(GTK_DEP_CFLAGS) -LDADD = \ - $(top_builddir)/gtk/libgtk-3.la \ - $(top_builddir)/gdk/libgdk-3.la \ +GTK_LIBS = \ + $(top_builddir)/gtk/libgtk-3.la \ + $(top_builddir)/gdk/libgdk-3.la \ $(GTK_DEP_LIBS) noinst_PROGRAMS = exampleapp -exampleapp_SOURCES = \ - main.c \ - exampleapp.c exampleapp.h \ - exampleappwin.c exampleappwin.h \ - exampleappprefs.c exampleappprefs.h \ +exampleapp_CFLAGS = $(GTK_CFLAGS) +exampleapp_LDADD = $(GTK_LIBS) +exampleapp_SOURCES = \ + main.c \ + exampleapp.c exampleapp.h \ + exampleappwin.c exampleappwin.h \ + exampleappprefs.c exampleappprefs.h \ resources.c -BUILT_SOURCES = \ - resources.c \ +BUILT_SOURCES = \ + resources.c \ gschemas.compiled resources.c: exampleapp.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/exampleapp.gresource.xml) $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \ --target=$@ --sourcedir=$(srcdir) --generate-source -gsettings_SCHEMAS = \ +gsettings_SCHEMAS = \ org.gtk.exampleapp.gschema.xml @GSETTINGS_RULES@ @@ -36,15 +35,15 @@ gsettings_SCHEMAS = \ gschemas.compiled: org.gtk.exampleapp.gschema.xml $(GLIB_COMPILE_SCHEMAS) . -EXTRA_DIST = \ - window.ui \ - app-menu.ui \ - prefs.ui \ - gears-menu.ui \ - exampleapp.gresource.xml \ +EXTRA_DIST = \ + window.ui \ + app-menu.ui \ + prefs.ui \ + gears-menu.ui \ + exampleapp.gresource.xml \ org.gtk.exampleapp.gschema.xml -CLEANFILES = \ +CLEANFILES = \ gschemas.compiled -include $(top_srcdir)/git.mk |