Commit cf86c7c9 authored by Matthias Clasen's avatar Matthias Clasen

Move demos around

The pixbuf-demo gets its own subdirectory, the other small
tests move from demos/ to tests/.
parent 6499d89a
## Makefile.am for gtk+/demos ## Makefile.am for gtk+/demos
include $(top_srcdir)/Makefile.decl include $(top_srcdir)/Makefile.decl
SUBDIRS = gtk-demo SUBDIRS = gtk-demo pixbuf-demo
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
DEPS = \
$(top_builddir)/gtk/libgtk-3.la
LDADDS = \
$(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) \
$(MATH_LIB)
noinst_PROGRAMS = \
testanimation \
testpixbuf-color \
testpixbuf-save \
testpixbuf-scale \
pixbuf-demo
testpixbuf_save_DEPENDENCIES = $(DEPS)
testpixbuf_color_DEPENDENCIES = $(DEPS)
testpixbuf_scale_DEPENDENCIES = $(DEPS)
testanimation_DEPENDENCIES = $(DEPS)
pixbuf_demo_DEPENDENCIES = $(DEPS)
testpixbuf_save_LDADD = $(LDADDS)
testpixbuf_color_LDADD = $(LDADDS)
testpixbuf_scale_LDADD = $(LDADDS)
testanimation_LDADD = $(LDADDS)
pixbuf_demo_LDADD = $(LDADDS)
testpixbuf_save_SOURCES = testpixbuf-save.c
testpixbuf_color_SOURCES = testpixbuf-color.c
testpixbuf_scale_SOURCES = testpixbuf-scale.c
testanimation_SOURCES = testanimation.c
pixbuf_demo_SOURCES = pixbuf-demo.c
EXTRA_DIST += \
apple-red.png \
background.jpg \
gnome-applets.png \
gnome-calendar.png \
gnome-foot.png \
gnome-gimp.png \
gnome-gmush.png \
gnome-gsame.png \
gnu-keys.png
-include $(top_srcdir)/git.mk -include $(top_srcdir)/git.mk
## Makefile.am for gtk+/demos
include $(top_srcdir)/Makefile.decl
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
DEPS = \
$(top_builddir)/gtk/libgtk-3.la
LDADDS = \
$(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) \
$(MATH_LIB)
noinst_PROGRAMS = \
pixbuf-demo
pixbuf_demo_DEPENDENCIES = $(DEPS)
pixbuf_demo_LDADD = $(LDADDS)
pixbuf_demo_SOURCES = pixbuf-demo.c
EXTRA_DIST += \
apple-red.png \
background.jpg \
gnome-applets.png \
gnome-calendar.png \
gnome-foot.png \
gnome-gimp.png \
gnome-gmush.png \
gnome-gsame.png \
gnu-keys.png
-include $(top_srcdir)/git.mk
...@@ -89,7 +89,7 @@ noinst_PROGRAMS = $(TEST_PROGS) \ ...@@ -89,7 +89,7 @@ noinst_PROGRAMS = $(TEST_PROGS) \
testtreecolumns \ testtreecolumns \
testtreecolumnsizing \ testtreecolumnsizing \
testtreesort \ testtreesort \
testverticalcells \ testverticalcells \
treestoretest \ treestoretest \
testxinerama \ testxinerama \
testwindows \ testwindows \
...@@ -110,7 +110,11 @@ noinst_PROGRAMS = $(TEST_PROGS) \ ...@@ -110,7 +110,11 @@ noinst_PROGRAMS = $(TEST_PROGS) \
testnoscreen \ testnoscreen \
testtreepos \ testtreepos \
testsensitive \ testsensitive \
testtextview testtextview \
testanimation \
testpixbuf-save \
testpixbuf-color \
testpixbuf-scale
if USE_X11 if USE_X11
noinst_PROGRAMS += testerrors noinst_PROGRAMS += testerrors
...@@ -211,6 +215,10 @@ testnoscreen_DEPENDENCIES = $(TEST_DEPS) ...@@ -211,6 +215,10 @@ testnoscreen_DEPENDENCIES = $(TEST_DEPS)
testtreepos_DEPENDENCIES = $(TEST_DEPS) testtreepos_DEPENDENCIES = $(TEST_DEPS)
testsensitive_DEPENDENCIES = $(TEST_DEPS) testsensitive_DEPENDENCIES = $(TEST_DEPS)
testtextview_DEPENDENCIES = $(TEST_DEPS) testtextview_DEPENDENCIES = $(TEST_DEPS)
testanimation_DEPENDENCIES = $(TEST_DEPS)
testpixbuf_save_DEPENDENCIES = $(TEST_DEPS)
testpixbuf_color_DEPENDENCIES = $(TEST_DEPS)
testpixbuf_scale_DEPENDENCIES = $(TEST_DEPS)
flicker_LDADD = $(LDADDS) flicker_LDADD = $(LDADDS)
simple_LDADD = $(LDADDS) simple_LDADD = $(LDADDS)
...@@ -297,6 +305,10 @@ testnoscreen_LDADD = $(LDADDS) ...@@ -297,6 +305,10 @@ testnoscreen_LDADD = $(LDADDS)
testtreepos_LDADD = $(LDADDS) testtreepos_LDADD = $(LDADDS)
testsensitive_LDADD = $(LDADDS) testsensitive_LDADD = $(LDADDS)
testtextview_LDADD = $(LDADDS) testtextview_LDADD = $(LDADDS)
testanimation_LDADD = $(LDADDS)
testpixbuf_save_LDADD = $(LDADDS)
testpixbuf_color_LDADD = $(LDADDS)
testpixbuf_scale_LDADD = $(LDADDS)
testentrycompletion_SOURCES = \ testentrycompletion_SOURCES = \
...@@ -444,6 +456,14 @@ testtoplevelembed_SOURCES = testtoplevelembed.c ...@@ -444,6 +456,14 @@ testtoplevelembed_SOURCES = testtoplevelembed.c
testtextview_SOURCES = testtextview.c testtextview_SOURCES = testtextview.c
testanimation_SOURCES = testanimation.c
testpixbuf_scale_SOURCES = testpixbuf-scale.c
testpixbuf_color_SOURCES = testpixbuf-color.c
testpixbuf_save_SOURCES = testpixbuf-save.c
EXTRA_DIST += \ EXTRA_DIST += \
gradient1.png \ gradient1.png \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment