diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2014-06-30 17:13:05 -0400 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2014-07-07 13:37:38 -0400 |
| commit | 4d8b2af13ab914f0679a8b03d18e6023f8814b61 (patch) | |
| tree | 46bb2e80cb6b053a08ae148f7714ada336e3f05e | |
| parent | e86f409f32ea133b07d19712ddcf6178e2873702 (diff) | |
| download | gtk+-4d8b2af13ab914f0679a8b03d18e6023f8814b61.tar.gz | |
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
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | examples/Makefile.am | 3 | ||||
| -rw-r--r-- | examples/bp/Makefile.am | 16 | ||||
| -rw-r--r-- | examples/bp/bloatpad.c (renamed from examples/bloatpad.c) | 0 |
4 files changed, 18 insertions, 2 deletions
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 index 1eae5b6fb2..1eae5b6fb2 100644 --- a/examples/bloatpad.c +++ b/examples/bp/bloatpad.c |