[cheese] move test programs to tests/



commit f9413cb5af7d5f5890919f19be61f7e9e6dd5591
Author: daniel g. siegel <dgsiegel gnome org>
Date:   Thu Dec 3 01:57:49 2009 +0100

    move test programs to tests/

 .gitignore                                 |    4 ++--
 Makefile.am                                |    2 +-
 configure.ac                               |    1 +
 libcheese/Makefile.am                      |    6 ------
 tests/Makefile.am                          |   27 +++++++++++++++++++++++++++
 {libcheese => tests}/cheese-test-monitor.c |    0
 {libcheese => tests}/cheese-test-widget.c  |    0
 7 files changed, 31 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2c2daa9..00d04ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,5 +41,5 @@ help/*/cheese.xml
 .waf-*
 _build_
 *.swp
-libcheese/cheese-test-widget
-libcheese/cheese-test-monitor
+tests/cheese-test-widget
+tests/cheese-test-monitor
diff --git a/Makefile.am b/Makefile.am
index b5b9889..3b9c7cd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = libcheese src po data help
+SUBDIRS = libcheese src tests po data help
 
 EXTRA_DIST =			\
 	$(cheesedoc_DATA)	\
diff --git a/configure.ac b/configure.ac
index 3317a46..a1d303b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,6 +125,7 @@ data/pixmaps/Makefile
 help/Makefile
 libcheese/Makefile
 src/Makefile
+tests/Makefile
 po/Makefile.in
 ])
 
diff --git a/libcheese/Makefile.am b/libcheese/Makefile.am
index 1c07288..c56ed77 100644
--- a/libcheese/Makefile.am
+++ b/libcheese/Makefile.am
@@ -41,9 +41,3 @@ libcheese_gtk_la_SOURCES = \
 libcheese_gtk_la_LIBADD = \
 	libcheesecommon.la \
 	$(CHEESE_LIBS)
-
-noinst_PROGRAMS = cheese-test-widget cheese-test-monitor
-cheese_test_widget_SOURCES = cheese-test-widget.c
-cheese_test_widget_LDADD = $(CHEESE_LIBS) libcheese-gtk.la libcheesecommon.la
-cheese_test_monitor_SOURCES = cheese-test-monitor.c
-cheese_test_monitor_LDADD = $(CHEESE_LIBS) libcheese-gtk.la libcheesecommon.la
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000..f354ea8
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,27 @@
+INCLUDES = \
+	-DBINDIR=\"$(bindir)\" \
+	-DDATADIR=\"$(datadir)\" \
+	-DPREFIX=\""$(prefix)"\" \
+	-DSYSCONFDIR=\""$(sysconfdir)"\" \
+	-DLIBDIR=\""$(libdir)"\" \
+	-DPACKAGE_DATADIR=\""$(datadir)/cheese"\" \
+	-DPACKAGE_LOCALEDIR=\""$(datadir)/locale"\" \
+	-DAPPNAME_DATA_DIR=\"$(pkgdatadir)\" \
+	-DGNOME_DESKTOP_USE_UNSTABLE_API=1 \
+	$(CHEESE_CFLAGS) \
+	-I top_srcdir@/libcheese \
+	$(NULL)
+
+noinst_PROGRAMS = cheese-test-widget cheese-test-monitor
+
+cheese_test_widget_SOURCES = cheese-test-widget.c
+cheese_test_monitor_SOURCES = cheese-test-monitor.c
+
+cheese_test_widget_LDADD = $(CHEESE_LIBS) \
+	$(top_builddir)/libcheese/libcheesecommon.la \
+	$(top_builddir)/libcheese/libcheese-gtk.la \
+	$(NULL)
+cheese_test_monitor_LDADD = $(CHEESE_LIBS) \
+	$(top_builddir)/libcheese/libcheesecommon.la \
+	$(top_builddir)/libcheese/libcheese-gtk.la \
+	$(NULL)
diff --git a/libcheese/cheese-test-monitor.c b/tests/cheese-test-monitor.c
similarity index 100%
rename from libcheese/cheese-test-monitor.c
rename to tests/cheese-test-monitor.c
diff --git a/libcheese/cheese-test-widget.c b/tests/cheese-test-widget.c
similarity index 100%
rename from libcheese/cheese-test-widget.c
rename to tests/cheese-test-widget.c



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]