summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2011-05-29 16:29:41 (GMT)
committer Jaromil <jaromil@dyne.org>2011-05-29 16:29:41 (GMT)
commitfff07b86d78226ce809870e240e2784173c03327 (patch)
tree42980fd6ca887280934160424617c691963034af
parent58026857a2b5f746dde31fc1f923707ead29bb9a (diff)
separated test programs from distributed binaries
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile.am7
-rw-r--r--test/Makefile.am13
-rw-r--r--test/rtctest.cpp (renamed from src/rtctest.cpp)0
-rw-r--r--test/tbtcheck.cpp (renamed from src/tbtcheck.cpp)0
6 files changed, 19 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index 1799d25..9bc44a3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,5 @@
SUBDIRS = src doc
+shareddir=$(prefix)/share/tbt
+
+
diff --git a/configure.ac b/configure.ac
index f4a581b..6838b5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,6 +52,7 @@ Makefile
src/Makefile
src/slw/Makefile
doc/Makefile
+test/Makefile
])
AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index f572e0f..03a3815 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,8 +9,7 @@ noinst_HEADERS = tbt.h rtclock.h
LIBS = -lpthread -lslang $(top_builddir)/src/slw/libslw.a
-
-bin_PROGRAMS = tbt recmail tbtcheck rtctest
+bin_PROGRAMS = tbt recmail
tbt_SOURCES = $(SOURCES) cmdline.cpp
tbt_LDADD = $(LIBS)
@@ -18,7 +17,5 @@ tbt_LDADD = $(LIBS)
recmail_SOURCES = $(SOURCES) recmail.cpp
recmail_LDADD = $(LIBS)
-tbtcheck_SOURCES = $(SOURCES) tbtcheck.cpp
-tbtcheck_LDADD = $(LIBS)
-rtctest_SOURCES = $(SOURCES) rtctest.cpp
+
diff --git a/test/Makefile.am b/test/Makefile.am
new file mode 100644
index 0000000..2166447
--- /dev/null
+++ b/test/Makefile.am
@@ -0,0 +1,13 @@
+
+bin_PROGRAMS = rtctest tbtcheck
+
+rtctest_SOURCES = rtctest.cpp
+rtctest_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/slw
+rtctest_LDADD = $(top_builddir)/src/rtclock.o \
+ $(top_builddir)/src/slw/libslw.a -lslang -lpthread
+
+tbtcheck_SOURCES = tbtcheck.cpp
+tbtcheck_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/slw
+tbtcheck_LDADD = $(top_builddir)/src/tbt.o \
+ $(top_builddir)/src/rtclock.o \
+ $(top_builddir)/src/slw/libslw.a -lslang -lpthread \ No newline at end of file
diff --git a/src/rtctest.cpp b/test/rtctest.cpp
index f66f7f1..f66f7f1 100644
--- a/src/rtctest.cpp
+++ b/test/rtctest.cpp
diff --git a/src/tbtcheck.cpp b/test/tbtcheck.cpp
index 370e8c2..370e8c2 100644
--- a/src/tbtcheck.cpp
+++ b/test/tbtcheck.cpp