[Aptitude-svn-commit] r4405 - in branches/aptitude-0.3/aptitude: . src src/cmdline src/generic/apt src/generic/problemresolver src/generic/util src/vscreen src/vscreen/config tests

[Daniel Burrows]

Author: dburrows
Date: Sat Oct  1 02:29:54 2005
New Revision: 4405

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/Makefile.am
   branches/aptitude-0.3/aptitude/src/cmdline/Makefile.am
   branches/aptitude-0.3/aptitude/src/generic/apt/Makefile.am
   branches/aptitude-0.3/aptitude/src/generic/problemresolver/Makefile.am
   branches/aptitude-0.3/aptitude/src/generic/util/Makefile.am
   branches/aptitude-0.3/aptitude/src/vscreen/Makefile.am
   branches/aptitude-0.3/aptitude/src/vscreen/config/Makefile.am
   branches/aptitude-0.3/aptitude/tests/Makefile.am
Log:
Support VPATH builds: add -I$(top_builddir) to pick up config.h and reference
linker targets via top_builddir.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Oct  1 02:29:54 2005
@@ -1,5 +1,10 @@
 2005-09-30  Daniel Burrows  <dburrows at debian.org>
 
+	* src/Makefile.am, src/cmdline/Makefile.am, src/generic/apt/Makefile.am, src/generic/problemresolver/Makefile.am, src/generic/util/Makefile.am, src/vscreen/Makefile.am, src/vscreen/config/Makefile.am, tests/Makefile.am:
+
+	  Include $(top_builddir) so we can get config.h in VPATH builds
+	  (e.g., in 'make distcheck').
+
 	* doc/en/aptitude.xml:
 
 	  Correct a strange turn of phrase.

Modified: branches/aptitude-0.3/aptitude/src/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/src/Makefile.am	(original)
+++ branches/aptitude-0.3/aptitude/src/Makefile.am	Sat Oct  1 02:29:54 2005
@@ -3,7 +3,7 @@
 SUBDIRS=generic vscreen cmdline mine
 
 localedir = $(datadir)/locale
-INCLUDES = -Wall @WERROR@ -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/intl
+INCLUDES = -Wall @WERROR@ -I$(top_builddir) -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/intl.h
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 bin_PROGRAMS=aptitude

Modified: branches/aptitude-0.3/aptitude/src/cmdline/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/Makefile.am	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/Makefile.am	Sat Oct  1 02:29:54 2005
@@ -1,4 +1,4 @@
-INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/intl
+INCLUDES=-I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/intl
 
 noinst_LIBRARIES=libcmdline.a
 

Modified: branches/aptitude-0.3/aptitude/src/generic/apt/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/Makefile.am	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/Makefile.am	Sat Oct  1 02:29:54 2005
@@ -1,7 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 localedir = $(datadir)/locale
-INCLUDES = -Wall @WERROR@ -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/intl
+INCLUDES = -Wall @WERROR@ -I$(top_builddir) -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/intl
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 LDADD = @LIBINTL@
 
@@ -10,7 +10,7 @@
 noinst_LIBRARIES = libgeneric-apt.a
 noinst_PROGRAMS  = pkg_hier_dump
 
-pkg_hier_dump_LDADD = ../util/libgeneric-util.a
+pkg_hier_dump_LDADD = $(top_builddir)/src/generic/util/libgeneric-util.a
 
 libgeneric_apt_a_SOURCES = \
         acqprogress.cc      \

Modified: branches/aptitude-0.3/aptitude/src/generic/problemresolver/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/problemresolver/Makefile.am	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/problemresolver/Makefile.am	Sat Oct  1 02:29:54 2005
@@ -1,10 +1,10 @@
-INCLUDES = -Wall @WERROR@ -I../../ -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/intl
+INCLUDES = -Wall @WERROR@ -I$(top_builddir) -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/intl
 
 EXTRA_DIST=model.tex test1.txt test3.txt test4.txt
 
 noinst_PROGRAMS=test
 
-test_LDADD = ../util/libgeneric-util.a
+test_LDADD = $(top_builddir)/src/generic/util/libgeneric-util.a
 
 test_SOURCES=test.cc dump_universe.h \
 	dummy_universe.cc dummy_universe.h \

Modified: branches/aptitude-0.3/aptitude/src/generic/util/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/util/Makefile.am	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/util/Makefile.am	Sat Oct  1 02:29:54 2005
@@ -1,7 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 localedir = $(datadir)/locale
-INCLUDES = -Wall @WERROR@ -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/intl
+INCLUDES = -Wall @WERROR@ -I$(top_builddir) -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/intl
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 noinst_LIBRARIES = libgeneric-util.a

Modified: branches/aptitude-0.3/aptitude/src/vscreen/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/Makefile.am	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/Makefile.am	Sat Oct  1 02:29:54 2005
@@ -5,7 +5,7 @@
 EXTRA_DIST=README.layout
 
 localedir = $(datadir)/locale
-INCLUDES = -Wall @WERROR@ -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/src -I../../intl
+INCLUDES = -Wall @WERROR@ -I$(top_builddir) -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/intl
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 LDADD = @LIBINTL@
 
@@ -87,4 +87,4 @@
 testvscreen_SOURCES=	\
 	testvscreen.cc
 
-testvscreen_LDADD=libvscreen.a config/libconf.a ../generic/util/libgeneric-util.a
+testvscreen_LDADD=libvscreen.a config/libconf.a $(top_builddir)/src/generic/util/libgeneric-util.a

Modified: branches/aptitude-0.3/aptitude/src/vscreen/config/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/config/Makefile.am	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/config/Makefile.am	Sat Oct  1 02:29:54 2005
@@ -1,7 +1,7 @@
 MAINTAINERCLEANFILES=Makefile.in
 
 localedir = $(datadir)/locale
-INCLUDES = -Wall @WERROR@ -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/src -I../../../intl
+INCLUDES = -Wall @WERROR@ -I$(top_builddir) -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/intl
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 LDADD = @LIBINTL@
 

Modified: branches/aptitude-0.3/aptitude/tests/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/tests/Makefile.am	(original)
+++ branches/aptitude-0.3/aptitude/tests/Makefile.am	Sat Oct  1 02:29:54 2005
@@ -1,7 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-INCLUDES = -Wall @WERROR@ -I$(top_srcdir) -I$(top_srcdir)/src -I$(srcdir)
-LDADD = ../src/generic/apt/libgeneric-apt.a ../src/generic/problemresolver/dummy_universe.o ../src/generic/util/libgeneric-util.a -lcppunit
+INCLUDES = -Wall @WERROR@ -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(srcdir) -I$(top_srcdir)/intl
+LDADD = $(top_builddir)/src/generic/apt/libgeneric-apt.a $(top_builddir)/src/generic/problemresolver/dummy_universe.o $(top_builddir)/src/generic/util/libgeneric-util.a -lcppunit
 
 check_PROGRAMS = test