[aravis] build: move sample programs to $(top_srcdir)/tests.



commit 347cdd21bffa3bfad178d5d29790ef58d12f8464
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Fri Aug 6 11:25:37 2010 +0200

    build: move sample programs to $(top_srcdir)/tests.

 src/.gitignore                    |    6 ------
 src/Makefile.am                   |   16 ----------------
 tests/.gitignore                  |    5 +++++
 tests/Makefile.am                 |   21 +++++++++++++++++++--
 {src => tests}/arvcameratest.c    |    0
 {src => tests}/arvevaluatortest.c |    0
 {src => tests}/arvgenicamtest.c   |    0
 {src => tests}/arvtest.c          |    0
 {src => tests}/arvziptest.c       |    0
 9 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/src/.gitignore b/src/.gitignore
index c32338c..c687532 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,9 +1,3 @@
-arv-test
-arv-load-xml
-arv-genicam-test
-arv-evaluator-test
-arv-zip-test
-arv-camera-test
 arv-fake-gv-camera
 arvenumtypes.c
 arvenumtypes.h
diff --git a/src/Makefile.am b/src/Makefile.am
index d1d7fc6..cb8f51a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -120,24 +120,8 @@ arvenumtypes.h: arvenumtypes.h.template $(ARAVIS_HDRS) $(GLIB_MKENUMS)
 arvenumtypes.c: arvenumtypes.c.template $(ARAVIS_HDRS) $(GLIB_MKENUMS)
 	$(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template arvenumtypes.c.template $(libaravis_la_HEADERS)) > $@
 
-noinst_PROGRAMS = arv-test arv-genicam-test arv-evaluator-test arv-zip-test arv-camera-test
 bin_PROGRAMS = arv-fake-gv-camera
 
-arv_test_SOURCES = arvtest.c
-arv_test_LDADD = $(ARAVIS_LIBS) libaravis.la
-
-arv_genicam_test_SOURCES = arvgenicamtest.c
-arv_genicam_test_LDADD = $(ARAVIS_LIBS) libaravis.la
-
-arv_evaluator_test_SOURCES = arvevaluatortest.c
-arv_evaluator_test_LDADD = $(ARAVIS_LIBS) libaravis.la
-
-arv_zip_test_SOURCES = arvziptest.c
-arv_zip_test_LDADD = $(ARAVIS_LIBS) libaravis.la
-
-arv_camera_test_SOURCES = arvcameratest.c
-arv_camera_test_LDADD = $(ARAVIS_LIBS) libaravis.la
-
 arv_fake_gv_camera_SOURCES = arvfakegvcamera.c
 arv_fake_gv_camera_LDADD = $(ARAVIS_LIBS) libaravis.la
 
diff --git a/tests/.gitignore b/tests/.gitignore
index 6d77df7..2c99942 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,3 +1,8 @@
 evaluator
 genicam
 fake
+arv-test
+arv-genicam-test
+arv-evaluator-test
+arv-zip-test
+arv-camera-test
diff --git a/tests/Makefile.am b/tests/Makefile.am
index fdf98f2..88b1e8d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,14 +2,31 @@ include $(top_srcdir)/Makefile.decl
 
 INCLUDES = -g -I$(top_srcdir)/src/ $(ARAVIS_CFLAGS)
 
-noinst_PROGRAMS = $(TEST_PROGS)
-
 test_progs_ldadd = 					\
 	$(top_builddir)/src/libaravis.la		\
 	$(ARAVIS_LIBS)
 
+noinst_PROGRAMS = arv-test arv-genicam-test arv-evaluator-test arv-zip-test arv-camera-test
+
+arv_test_SOURCES = arvtest.c
+arv_test_LDADD = $(test_progs_ldadd)
+
+arv_genicam_test_SOURCES = arvgenicamtest.c
+arv_genicam_test_LDADD = $(test_progs_ldadd)
+
+arv_evaluator_test_SOURCES = arvevaluatortest.c
+arv_evaluator_test_LDADD = $(test_progs_ldadd)
+
+arv_zip_test_SOURCES = arvziptest.c
+arv_zip_test_LDADD = $(test_progs_ldadd)
+
+arv_camera_test_SOURCES = arvcameratest.c
+arv_camera_test_LDADD = $(test_progs_ldadd)
+
 TEST_PROGS += evaluator fake
 
+noinst_PROGRAMS += $(TEST_PROGS)
+
 evaluator_SOURCES = evaluator.c
 evaluator_LDADD = $(test_progs_ldadd)
 
diff --git a/src/arvcameratest.c b/tests/arvcameratest.c
similarity index 100%
rename from src/arvcameratest.c
rename to tests/arvcameratest.c
diff --git a/src/arvevaluatortest.c b/tests/arvevaluatortest.c
similarity index 100%
rename from src/arvevaluatortest.c
rename to tests/arvevaluatortest.c
diff --git a/src/arvgenicamtest.c b/tests/arvgenicamtest.c
similarity index 100%
rename from src/arvgenicamtest.c
rename to tests/arvgenicamtest.c
diff --git a/src/arvtest.c b/tests/arvtest.c
similarity index 100%
rename from src/arvtest.c
rename to tests/arvtest.c
diff --git a/src/arvziptest.c b/tests/arvziptest.c
similarity index 100%
rename from src/arvziptest.c
rename to tests/arvziptest.c



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