summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac1
-rw-r--r--libopkg/Makefile.am11
-rw-r--r--tests/Makefile.am12
-rw-r--r--tests/opkg_extract_test.c (renamed from libopkg/opkg_extract_test.c)0
-rw-r--r--tests/opkg_hash_test.c (renamed from libopkg/opkg_hash_test.c)0
6 files changed, 14 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am
index 69b61f0..07de343 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,4 @@
-#SUBDIRS = etc replace familiar libbb
-SUBDIRS = etc familiar libbb libopkg src
+SUBDIRS = etc familiar libbb libopkg tests src
HOST_CPU=@host_cpu@
BUILD_CPU=@build_cpu@
diff --git a/configure.ac b/configure.ac
index c98db77..d36fa5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,6 +129,7 @@ AC_SUBST(opkglibdir)
AC_OUTPUT(
Makefile
libopkg/Makefile
+ tests/Makefile
src/Makefile
etc/Makefile
familiar/Makefile
diff --git a/libopkg/Makefile.am b/libopkg/Makefile.am
index ad4de4d..a780825 100644
--- a/libopkg/Makefile.am
+++ b/libopkg/Makefile.am
@@ -63,14 +63,3 @@ libopkg_la_CFLAGS = -DOPKG_LIB $(ALL_CFLAGS) $(CURL_CFLAGS) $(GPGME_CFLAGS)
lib_LTLIBRARIES = libopkg.la
-noinst_PROGRAMS = opkg_hash_test opkg_extract_test
-
-opkg_hash_test_LDADD = $(top_builddir)/libbb/libbb.la
-opkg_hash_test_SOURCES = opkg_hash_test.c $(opkg_db_sources) $(opkg_util_sources) $(opkg_list_sources)
-opkg_hash_test_CFLAGS = $(ALL_CFLAGS)
-
-opkg_extract_test_LDADD = $(top_builddir)/libbb/libbb.la
-opkg_extract_test_SOURCES = opkg_extract_test.c $(opkg_db_sources) $(opkg_util_sources) $(opkg_list_sources)
-opkg_extract_test_CFLAGS = $(ALL_CFLAGS)
-
-
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000..f7be7ff
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,12 @@
+
+noinst_PROGRAMS = opkg_hash_test opkg_extract_test
+
+opkg_hash_test_LDADD = $(top_builddir)/libbb/libbb.la $(top_builddir)/libopkg/libopkg.la
+opkg_hash_test_SOURCES = opkg_hash_test.c
+opkg_hash_test_CFLAGS = $(ALL_CFLAGS) -I$(top_builddir)
+
+opkg_extract_test_LDADD = $(top_builddir)/libbb/libbb.la $(top_builddir)/libopkg/libopkg.la
+opkg_extract_test_SOURCES = opkg_extract_test.c
+opkg_extract_test_CFLAGS = $(ALL_CFLAGS) -I$(top_builddir)
+
+
diff --git a/libopkg/opkg_extract_test.c b/tests/opkg_extract_test.c
index 83e23e3..83e23e3 100644
--- a/libopkg/opkg_extract_test.c
+++ b/tests/opkg_extract_test.c
diff --git a/libopkg/opkg_hash_test.c b/tests/opkg_hash_test.c
index 934dac7..934dac7 100644
--- a/libopkg/opkg_hash_test.c
+++ b/tests/opkg_hash_test.c