Commit d5565f5b authored by Michael Natterer's avatar Michael Natterer Committed by Michael Natterer

tests/Makefile.am tests/autotestfilechooser.c tests/buildertest.c

2008-06-18  Michael Natterer  <mitch@imendio.com>

	* tests/Makefile.am
	* tests/autotestfilechooser.c
	* tests/buildertest.c
	* tests/defaultvaluetest.c
	* tests/floatingtest.c
	* tests/objecttests.c
	* tests/pixbuf-init.c
	* tests/textbuffertest.c: remove unit tests here...

	* gtk/tests/Makefile.am
	* gtk/tests/builder.c
	* gtk/tests/defaultvalue.c
	* gtk/tests/filechooser.c
	* gtk/tests/floating.c
	* gtk/tests/object.c
	* gtk/tests/pixbuf-init.c
	* gtk/tests/textbuffer.c: ...and add them here.


svn path=/trunk/; revision=20450
parent 67c6c28f
2008-06-18 Michael Natterer <mitch@imendio.com>
* tests/Makefile.am
* tests/autotestfilechooser.c
* tests/buildertest.c
* tests/defaultvaluetest.c
* tests/floatingtest.c
* tests/objecttests.c
* tests/pixbuf-init.c
* tests/textbuffertest.c: remove unit tests here...
* gtk/tests/Makefile.am
* gtk/tests/builder.c
* gtk/tests/defaultvalue.c
* gtk/tests/filechooser.c
* gtk/tests/floating.c
* gtk/tests/object.c
* gtk/tests/pixbuf-init.c
* gtk/tests/textbuffer.c: ...and add them here.
2008-06-18 Michael Natterer <mitch@imendio.com>
* gdk/gdk.h: deprecate GdkDestroyNotify.
......
include $(top_srcdir)/Makefile.decl
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
-I$(top_srcdir)/gdk \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
DEPS = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
progs_ldadd = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
-I$(top_srcdir)/gdk \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS)
DEPS = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
progs_ldadd = \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib)
noinst_PROGRAMS = $(TEST_PROGS)
TEST_PROGS += testing
testing_SOURCES = testing.c
testing_LDADD = $(progs_ldadd)
TEST_PROGS += testing
testing_SOURCES = testing.c
testing_LDADD = $(progs_ldadd)
TEST_PROGS += liststore
liststore_SOURCES = liststore.c
liststore_LDADD = $(progs_ldadd)
TEST_PROGS += treestore
treestore_SOURCES = treestore.c
treestore_LDADD = $(progs_ldadd)
TEST_PROGS += treeview-scrolling
treeview_scrolling_SOURCES = treeview-scrolling.c
treeview_scrolling_LDADD = $(progs_ldadd)
TEST_PROGS += recentmanager
recentmanager_SOURCES = recentmanager.c
recentmanager_LDADD = $(progs_ldadd)
TEST_PROGS += floating
floating_SOURCES = floating.c
floating_LDADD = $(progs_ldadd)
TEST_PROGS += object
object_SOURCES = object.c pixbuf-init.c
object_LDADD = $(progs_ldadd)
TEST_PROGS += liststore
liststore_SOURCES = liststore.c
liststore_LDADD = $(progs_ldadd)
# this doesn't work in make distcheck, since it doesn't
# find file-chooser-test-dir
# TEST_PROGS += filechooser
filechooser_SOURCES = filechooser.c pixbuf-init.c
filechooser_LDADD = $(progs_ldadd)
TEST_PROGS += treestore
treestore_SOURCES = treestore.c
treestore_LDADD = $(progs_ldadd)
TEST_PROGS += builder
builder_SOURCES = builder.c
builder_LDADD = $(progs_ldadd)
builder_LDFLAGS = -export-dynamic
TEST_PROGS += treeview-scrolling
treeview_scrolling_SOURCES = treeview-scrolling.c
treeview_scrolling_LDADD = $(progs_ldadd)
if OS_UNIX
TEST_PROGS += defaultvalue
endif
defaultvalue_SOURCES = defaultvalue.c pixbuf-init.c
defaultvalue_LDADD = $(progs_ldadd)
TEST_PROGS += recentmanager
recentmanager_SOURCES = recentmanager.c
recentmanager_LDADD = $(progs_ldadd)
TEST_PROGS += textbuffer
textbuffer_SOURCES = textbuffer.c pixbuf-init.c
textbuffer_LDADD = $(progs_ldadd)
......@@ -15,6 +15,6 @@ file_exists (const char *filename)
void
pixbuf_init (void)
{
if (file_exists ("../gdk-pixbuf/libpixbufloader-pnm.la"))
g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
if (file_exists ("../../gdk-pixbuf/libpixbufloader-pnm.la"))
g_setenv ("GDK_PIXBUF_MODULE_FILE", "../../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
}
......@@ -25,34 +25,6 @@ if USE_X11
testsocket_programs = testsocket testsocket_child
endif
TEST_PROGS += floatingtest
floatingtest_DEPENDENCIES = $(TEST_DEPS)
floatingtest_LDADD = $(LDADDS)
TEST_PROGS += objecttests
objecttests_SOURCES = objecttests.c pixbuf-init.c
objecttests_LDADD = $(LDADDS)
objecttests_DEPENDENCIES = $(TEST_DEPS)
# this doesn't work in make distcheck, since it doesn't
# find file-chooser-test-dir
# TEST_PROGS += autotestfilechooser
autotestfilechooser_DEPENDENCIES = $(TEST_DEPS)
autotestfilechooser_LDADD = $(LDADDS)
autotestfilechooser_SOURCES = autotestfilechooser.c pixbuf-init.c
TEST_PROGS += buildertest
buildertest_DEPENDENCIES = $(TEST_DEPS)
buildertest_LDADD = $(LDADDS)
buildertest_LDFLAGS = -export-dynamic
if OS_UNIX
TEST_PROGS += defaultvaluetest
endif
defaultvaluetest_DEPENDENCIES = $(TEST_DEPS)
defaultvaluetest_LDADD = $(LDADDS)
defaultvaluetest_SOURCES = defaultvaluetest.c pixbuf-init.c
TEST_PROGS += textbuffertest
textbuffertest_DEPENDENCIES = $(TEST_DEPS)
textbuffertest_LDADD = $(LDADDS)
textbuffertest_SOURCES = textbuffertest.c pixbuf-init.c
noinst_PROGRAMS = $(TEST_PROGS) \
simple \
print-editor \
......
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