summaryrefslogtreecommitdiff
path: root/tests/Makefile.am
diff options
context:
space:
mode:
authorDaniel_Burrows@alumni.brown.edu <Daniel_Burrows@alumni.brown.edu>2010-07-03 23:48:07 -0700
committerDaniel Burrows <Daniel Burrows Daniel_Burrows@alumni.brown.edu>2010-07-03 23:49:22 -0700
commitc286cba98a4c9c81c8b983d4593b6bfe5738c76b (patch)
treecab3bf9881a565d2eeb93340fa49c637c5b226fe /tests/Makefile.am
parentb2aa333c7b9af41a0aa0122d9d976a4dee2be6ba (diff)
downloadaptitude-c286cba98a4c9c81c8b983d4593b6bfe5738c76b.tar.gz
Move the search input controller and view classes over to generic/.
As a side effect, this creates a "controllers" directory in the generic tree, and removes the now-empty GTK+-specific controller and view directories. The README files are moved over to the generic locations and tweaked to be correct for their new home.
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r--tests/Makefile.am7
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 12a7ecb9..273064b2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,19 +1,16 @@
MAINTAINERCLEANFILES = Makefile.in
-if BUILD_GTK
- MAYBE_LIBGTK = $(top_builddir)/src/gtk/views/libgtk-views.a $(top_builddir)/src/gtk/controllers/libgtk-controllers.a
-endif
-
INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(srcdir)
BOOST_TEST_LDFLAGS = @BOOST_UNIT_TEST_LIBS@
GMOCK_LDFLAGS = -lgmock -lgtest
AM_CPPFLAGS = -DBOOST_TEST_DYN_LINK -DSRCDIR=\"$(srcdir)\"
LDADD = $(top_builddir)/src/loggers.o \
-$(MAYBE_LIBGTK) \
$(top_builddir)/src/generic/apt/matching/libgeneric-matching.a \
$(top_builddir)/src/cmdline/libcmdline.a \
$(top_builddir)/src/generic/apt/libgeneric-apt.a \
+$(top_builddir)/src/generic/controllers/libgeneric-controllers.a \
$(top_builddir)/src/generic/apt/matching/libgeneric-matching.a \
+$(top_builddir)/src/generic/apt/libgeneric-apt.a \
$(top_builddir)/src/generic/problemresolver/libgeneric-problemresolver.a \
$(top_builddir)/src/cmdline/mocks/libcmdline-mocks.a \
$(top_builddir)/src/cmdline/libcmdline.a \