From: Iain Hibbert <[email protected]>
add "-Wall foreign nostdinc" to the automake arguments
nostdinc cuts the -I. -I$(top_srcdir) out of the C makefiles as otherwise
it is not possible to include <uuid.h> and "uuid.h" on NetBSD
change the Makefile.am to include $(top_builddir) so that <config.h> can
still be found
add BLUETOOTH_CFLAGS to Makefiles where BLUETOOTH_LIBS is used
---
apps/Makefile.am | 3 ++-
bfb/Makefile.am | 3 ++-
configure.in | 2 +-
multicobex/Makefile.am | 3 ++-
obexftp/Makefile.am | 3 ++-
5 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/apps/Makefile.am b/apps/Makefile.am
index 9f727e6..f949ce1 100644
--- a/apps/Makefile.am
+++ b/apps/Makefile.am
@@ -1,5 +1,6 @@
AM_CFLAGS = @OPENOBEX_CFLAGS@ \
- -I$(top_srcdir) \
+ @BLUETOOTH_CFLAGS@ \
+ -I$(top_builddir) \
-I$(top_srcdir)/includes
LDADD = ../obexftp/libobexftp.la \
diff --git a/bfb/Makefile.am b/bfb/Makefile.am
index b05c732..1eb0cd2 100644
--- a/bfb/Makefile.am
+++ b/bfb/Makefile.am
@@ -1,6 +1,7 @@
lib_LTLIBRARIES = libbfb.la
-AM_CFLAGS = -I$(top_srcdir)/includes
+AM_CFLAGS = -I$(top_builddir) \
+ -I$(top_srcdir)/includes
bfbincludedir = $(includedir)/bfb
diff --git a/configure.in b/configure.in
index 5778899..a07ee53 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
# try CFLAGS="$CFLAGS -g -Wall -Wmissing-declarations -Wmissing-prototypes
-Werror"
AC_INIT(ObexFTP, 0.23, [email protected])
#AC_CONFIG_SRCDIR(src/foo.c)
-AM_INIT_AUTOMAKE(dist-bzip2)
+AM_INIT_AUTOMAKE([-Wall foreign 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..2e80843 100644
--- a/multicobex/Makefile.am
+++ b/multicobex/Makefile.am
@@ -1,7 +1,8 @@
lib_LTLIBRARIES = libmulticobex.la
AM_CFLAGS = @OPENOBEX_CFLAGS@ \
- -I$(top_srcdir) \
+ @BLUETOOTH_CFLAGS@ \
+ -I$(top_builddir) \
-I$(top_srcdir)/includes
multicobexincludedir = $(includedir)/multicobex
diff --git a/obexftp/Makefile.am b/obexftp/Makefile.am
index 78aef27..5341ea0 100644
--- a/obexftp/Makefile.am
+++ b/obexftp/Makefile.am
@@ -1,7 +1,8 @@
lib_LTLIBRARIES = libobexftp.la
AM_CFLAGS = @OPENOBEX_CFLAGS@ \
- -I$(top_srcdir) \
+ @BLUETOOTH_CFLAGS@ \
+ -I$(top_builddir) \
-I$(top_srcdir)/includes
obexftpincludedir = $(includedir)/obexftp
--
1.7.4.1
------------------------------------------------------------------------------
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Data protection magic?
Nope - It's vRanger. Get your free trial download today.
http://p.sf.net/sfu/quest-sfdev2dev
_______________________________________________
Openobex-users mailing list
[email protected]
http://lists.sourceforge.net/lists/listinfo/openobex-users
