What's the decision on this? I've not heard anythng. Regards, Jeremy Henty On Sun, Jul 18, 2010 at 10:39:21AM +0100, Jeremy Henty wrote:
OK, the problem with VPATH builds is fixed but I think it can be improved.
Firstly, because -I is a preprocessor directive, it should be added to AM_CPP_FLAGS.
Secondly, the Makefile uses .. in various places to navigate from the current build directory to where various headers and libraries are. I think it is better to locate other directories from the top of the build and source trees. So I would prefer to use -I$(top_srcdir) instead of -I$(srcdir)/.. , and $(top_builddir)/path/to/lib instead of ../path/to/lib .
Patches attached, tested as before with in-source and external builds.
Regards,
Jeremy Henty
# HG changeset patch # Parent fec840b80fd3e19e99b9b0e3a56e7be1290a6fa5
diff -r fec840b80fd3 src/Makefile.am --- a/src/Makefile.am Sat Jul 17 20:18:15 2010 +0100 +++ b/src/Makefile.am Sat Jul 17 20:23:48 2010 +0100 @@ -1,9 +1,10 @@ AM_CPPFLAGS= \ + -I$(top_srcdir) \ -DDILLO_SYSCONF='"$(sysconfdir)/"' \ -DDILLO_DOCDIR='"$(docdir)/"' \ @LIBJPEG_CPPFLAGS@ AM_CFLAGS = @LIBPNG_CFLAGS@ -AM_CXXFLAGS = -I$(srcdir)/.. @LIBPNG_CFLAGS@ @LIBFLTK_CXXFLAGS@ +AM_CXXFLAGS = @LIBPNG_CFLAGS@ @LIBFLTK_CXXFLAGS@
SUBDIRS = IO
# HG changeset patch # Parent d813265f53f1d3b2e0ae23f7dd88f4fed2ed2361 diff -r d813265f53f1 -r 000ab53976d1 src/Makefile.am --- a/src/Makefile.am Sat Jul 17 20:23:48 2010 +0100 +++ b/src/Makefile.am Sat Jul 17 20:40:06 2010 +0100 @@ -11,13 +11,13 @@ bin_PROGRAMS = dillo
dillo_LDADD = \ - ../dlib/libDlib.a \ - ../dpip/libDpip.a \ + $(top_builddir)/dlib/libDlib.a \ + $(top_builddir)/dpip/libDpip.a \ IO/libDiof.a \ - ../dw/libDw-widgets.a \ - ../dw/libDw-fltk.a \ - ../dw/libDw-core.a \ - ../lout/liblout.a \ + $(top_builddir)/dw/libDw-widgets.a \ + $(top_builddir)/dw/libDw-fltk.a \ + $(top_builddir)/dw/libDw-core.a \ + $(top_builddir)/lout/liblout.a \ @LIBJPEG_LIBS@ @LIBPNG_LIBS@ @LIBFLTK_LIBS@ @LIBZ_LIBS@ @LIBICONV_LIBS@
dillo_SOURCES = \
_______________________________________________ Dillo-dev mailing list Dillo-dev@dillo.org http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/dillo-dev