From 4d8b2af13ab914f0679a8b03d18e6023f8814b61 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Mon, 30 Jun 2014 17:13:05 -0400 Subject: [PATCH] bloatpad: move into private subdir Move bloatpad to ./examples/bp/ so that we can start treating it as more of a "normal" app instead of just jamming everything into a single .c file. We don't use the name "bloatpad" for the directory in order not to create 'git pull' pain with the probably-already-existing executable of the same name. https://bugzilla.gnome.org/show_bug.cgi?id=722092 --- configure.ac | 1 + examples/Makefile.am | 3 +-- examples/bp/Makefile.am | 16 ++++++++++++++++ examples/{ => bp}/bloatpad.c | 0 4 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 examples/bp/Makefile.am rename examples/{ => bp}/bloatpad.c (100%) diff --git a/configure.ac b/configure.ac index 9c09aa8581..203607fd1d 100644 --- a/configure.ac +++ b/configure.ac @@ -1839,6 +1839,7 @@ demos/gtk-demo/geninclude.pl demos/widget-factory/Makefile demos/icon-browser/Makefile examples/Makefile +examples/bp/Makefile examples/application1/Makefile examples/application2/Makefile examples/application3/Makefile diff --git a/examples/Makefile.am b/examples/Makefile.am index f18b121711..710d4a35ec 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,4 +1,5 @@ SUBDIRS = \ + bp \ application1 application2 application3 \ application4 application5 application6 \ application7 application8 application9 \ @@ -10,7 +11,6 @@ AM_CPPFLAGS = \ -I$(top_builddir)/gdk \ -DGDK_DISABLE_DEPRECATED \ -DGTK_DISABLE_DEPRECATED \ - -DSRCDIR=\"$(abs_srcdir)\" \ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) @@ -22,7 +22,6 @@ LDADD = \ noinst_PROGRAMS = \ hello-world \ window-default \ - bloatpad \ plugman \ sunny \ action-namespace \ diff --git a/examples/bp/Makefile.am b/examples/bp/Makefile.am new file mode 100644 index 0000000000..5e92490bff --- /dev/null +++ b/examples/bp/Makefile.am @@ -0,0 +1,16 @@ +AM_CPPFLAGS = \ + -DSRCDIR=\"$(abs_srcdir)\" \ + -I$(top_srcdir) \ + -I$(top_srcdir)/gdk \ + -I$(top_builddir)/gdk \ + $(GTK_DEBUG_FLAGS) \ + $(GTK_DEP_CFLAGS) + +LDADD = \ + $(top_builddir)/gtk/libgtk-3.la \ + $(top_builddir)/gdk/libgdk-3.la \ + $(GTK_DEP_LIBS) + +noinst_PROGRAMS = bloatpad + +-include $(top_srcdir)/git.mk diff --git a/examples/bloatpad.c b/examples/bp/bloatpad.c similarity index 100% rename from examples/bloatpad.c rename to examples/bp/bloatpad.c