Makefile.am-s: allow building outside of the source tree

Hi,

I saw your announcement about kconfig-frontends to uclibc@uclibc.org
the other day, and thought I would try it out for our own project
where we use an old derivative of the kconfig system.

However, to make it build with our build system I needed to apply
the patch below to allow building outside the source tree.

After that all worked fine, and the generated .config file is
still the same as with the old config system. :)

[--SNIP unrelated message--]

Signed-off-by: Peter Kjellerstedt <pkj@axis.com>

diff --git a/frontends/conf/Makefile.am b/frontends/conf/Makefile.am
index bb5d5b6b1137f426dec2fe852bf80e02afbc4e56..9b464cc933d23db8c24261d16581d5f5f1acdf15 100644 (file)
--- a/frontends/conf/Makefile.am
+++ b/frontends/conf/Makefile.am
@@ -3,6 +3,6 @@ bin_PROGRAMS = conf
 conf_SOURCES = conf.c
 conf_CPPFLAGS = $(AM_CPPFLAGS)  \
                 $(GETTEXT)      \
-                -I../../libs/parser
-conf_LDADD = ../../libs/parser/libkconfigparser.la  \
+                -I$(top_srcdir)/libs/parser
+conf_LDADD = $(top_builddir)/libs/parser/libkconfigparser.la  \
              $(conf_EXTRA_LIBS)

diff --git a/frontends/gconf/Makefile.am b/frontends/gconf/Makefile.am
index d37b6920b283ba04b8133ad5faa80e03a5b49bc1..0edd622d6e6d123d696578003d6e449cb3ae0da0 100644 (file)
--- a/frontends/gconf/Makefile.am
+++ b/frontends/gconf/Makefile.am
@@ -3,12 +3,12 @@ bin_PROGRAMS = gconf
 gconf_SOURCES = gconf.c gconf.glade
 gconf_CPPFLAGS = $(AM_CPPFLAGS)         \
                  $(GETTEXT)             \
-                 -I../../libs/parser    \
-                 -I../../libs/images    \
+                 -I$(top_srcdir)/libs/parser    \
+                 -I$(top_srcdir)/libs/images    \
                  -DGUI_PATH='"$(pkgdatadir)/gconf.glade"'
 gconf_CFLAGS = $(AM_CFLAGS) \
                $(gtk_CFLAGS)
-gconf_LDADD = ../../libs/parser/libkconfigparser.la \
+gconf_LDADD = $(top_builddir)/libs/parser/libkconfigparser.la \
               $(gtk_LIBS) $(gconf_EXTRA_LIBS)
 gconfdir = $(pkgdatadir)
 gconf_DATA = gconf.glade

diff --git a/frontends/mconf/Makefile.am b/frontends/mconf/Makefile.am
index f33426f302b0cd2667337c8de2ad9f9b462a937e..9219d0da122086df807c206e6d8b46acee485831 100644 (file)
--- a/frontends/mconf/Makefile.am
+++ b/frontends/mconf/Makefile.am
@@ -4,8 +4,8 @@ mconf_SOURCES = mconf.c
 mconf_CPPFLAGS = $(AM_CPPFLAGS)                 \
                  -DCURSES_LOC='"$(CURSES_LOC)"' \
                  $(GETTEXT)                     \
-                 -I../../libs                   \
-                 -I../../libs/parser
-mconf_LDADD = ../../libs/parser/libkconfigparser.la \
-              ../../libs/lxdialog/liblxdialog.a     \
+                 -I$(top_srcdir)/libs                   \
+                 -I$(top_srcdir)/libs/parser
+mconf_LDADD = $(top_builddir)/libs/parser/libkconfigparser.la \
+              $(top_builddir)/libs/lxdialog/liblxdialog.a     \
               $(ncurses_LIBS) $(mconf_EXTRA_LIBS)

diff --git a/frontends/nconf/Makefile.am b/frontends/nconf/Makefile.am
index fe437fbb35c00f1d31f62f14c207d84966197e5b..241912c059805e50bfa74ae4c4a4f780a86bdc89 100644 (file)
--- a/frontends/nconf/Makefile.am
+++ b/frontends/nconf/Makefile.am
@@ -3,7 +3,7 @@ bin_PROGRAMS = nconf
 nconf_SOURCES = nconf.c nconf.gui.c nconf.h
 nconf_CPPFLAGS = $(AM_CPPFLAGS)     \
                  $(GETTEXT)         \
-                 -I../../libs/parser
-nconf_LDADD = ../../libs/parser/libkconfigparser.la \
+                 -I$(top_srcdir)/libs/parser
+nconf_LDADD = $(top_builddir)/libs/parser/libkconfigparser.la \
               $(ncurses_extra_LIBS) $(ncurses_LIBS) \
               $(nconf_EXTRA_LIBS)

diff --git a/frontends/qconf/Makefile.am b/frontends/qconf/Makefile.am
index 33ea998253859e6ebdea896f42d2da29f857ed79..9946857d3fee26868214953f009c4575bb43d080 100644 (file)
--- a/frontends/qconf/Makefile.am
+++ b/frontends/qconf/Makefile.am
@@ -4,11 +4,11 @@ qconf_SOURCES = qconf.cc qconf.h
 BUILT_SOURCES = qconf.moc
 qconf_CPPFLAGS = $(AM_CPPFLAGS)         \
                  $(GETTEXT)             \
-                 -I../../libs/parser    \
-                 -I../../libs/images
+                 -I$(top_srcdir)/libs/parser    \
+                 -I$(top_srcdir)/libs/images
 qconf_CXXFLAGS = $(AM_CXXFLAGS) \
                  $(qt4_CFLAGS)
-qconf_LDADD = ../../libs/parser/libkconfigparser.la \
+qconf_LDADD = $(top_builddir)/libs/parser/libkconfigparser.la \
               $(qt4_LIBS) $(qconf_EXTRA_LIBS)
 
 .h.moc: