From: Iain Hibbert <plu...@rya-online.net>
add "nostdinc" to the automake arguments, to cut out the automatic
"-I. -I$(top_srcdir)" in the makefiles as otherwise it is not possible
to include <uuid.h> and "uuid.h" on NetBSD, then add "-I$(top_srcdir)"
specifically back in, so that we can include <obexftp/*.h> files, and
"-I$(top_builddir)" so that <config.h> can still be found
---
apps/Makefile.am | 1 +
bfb/Makefile.am | 4 +++-
configure.in | 2 +-
multicobex/Makefile.am | 1 +
obexftp/Makefile.am | 1 +
5 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/apps/Makefile.am b/apps/Makefile.am
index 9f727e6..b15b0bc 100644
--- a/apps/Makefile.am
+++ b/apps/Makefile.am
@@ -1,4 +1,5 @@
AM_CFLAGS = @OPENOBEX_CFLAGS@ \
+ -I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/includes
diff --git a/bfb/Makefile.am b/bfb/Makefile.am
index b05c732..7a87fdf 100644
--- a/bfb/Makefile.am
+++ b/bfb/Makefile.am
@@ -1,6 +1,8 @@
lib_LTLIBRARIES = libbfb.la
-AM_CFLAGS = -I$(top_srcdir)/includes
+AM_CFLAGS = -I$(top_builddir) \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/includes
bfbincludedir = $(includedir)/bfb
diff --git a/configure.in b/configure.in
index b8d20bc..16bf3ca 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@
AC_PREREQ(2.60)
AC_INIT(ObexFTP, 0.23, z...@triq.net)
#AC_CONFIG_SRCDIR(src/foo.c)
-AM_INIT_AUTOMAKE(dist-bzip2)
+AM_INIT_AUTOMAKE([dist-bzip2 nostdinc])
AM_CONFIG_HEADER(config.h)
# note: AC_HELP_STRING is deprecated in autoconf 2.59 and later but
diff --git a/multicobex/Makefile.am b/multicobex/Makefile.am
index ea8eba5..471c611 100644
--- a/multicobex/Makefile.am
+++ b/multicobex/Makefile.am
@@ -1,6 +1,7 @@
lib_LTLIBRARIES = libmulticobex.la
AM_CFLAGS = @OPENOBEX_CFLAGS@ \
+ -I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/includes
diff --git a/obexftp/Makefile.am b/obexftp/Makefile.am
index 78aef27..f40a643 100644
--- a/obexftp/Makefile.am
+++ b/obexftp/Makefile.am
@@ -1,6 +1,7 @@
lib_LTLIBRARIES = libobexftp.la
AM_CFLAGS = @OPENOBEX_CFLAGS@ \
+ -I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/includes
--
1.7.4.1
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
Openobex-users mailing list
Openobex-users@lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/openobex-users
