From b8779d2202a2cd19fb9db8cdf9584a9718257072 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Fri, 7 Dec 2012 12:46:04 +0200 Subject: Revert "Ensure config.h is included by using CPPFLAGS" This reverts commit 8a03376544b046a84301847d1594f6c3674983ff. The patch needs to be split up and the gdbus/ changes were bogus compared to the original commit message. Conflicts: Makefile.am Makefile.obexd profiles/cyclingspeed/cyclingspeed.c profiles/heartrate/heartrate.c src/error.c --- Makefile.obexd | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Makefile.obexd') diff --git a/Makefile.obexd b/Makefile.obexd index e235acc54..cbcd65db8 100644 --- a/Makefile.obexd +++ b/Makefile.obexd @@ -29,8 +29,9 @@ obexd_src_obexd_CFLAGS = @GLIB_CFLAGS@ @DBUS_CFLAGS@ \ -DPLUGINDIR=\""$(obex_plugindir)"\" \ -fPIC -D_FILE_OFFSET_BITS=64 -obexd_src_obexd_CPPFLAGS = -include $(top_builddir)/config.h -I$(builddir)/lib \ - -I$(builddir)/obexd/src -I$(srcdir)/obexd/src +obexd_src_obexd_CPPFLAGS = -I$(builddir)/lib -I$(builddir)/obexd/src \ + -I$(srcdir)/obexd/src -I$(srcdir)/btio \ + -I$(srcdir)/gobex -I$(srcdir)/gdbus obexd_src_obexd_SHORTNAME = obexd @@ -75,7 +76,8 @@ obexd_client_obex_client_LDADD = lib/libbluetooth-private.la \ obexd_client_obex_client_CFLAGS = @GLIB_CFLAGS@ @DBUS_CFLAGS@ \ -fPIC -D_FILE_OFFSET_BITS=64 -obexd_client_obex_client_CPPFLAGS = -include $(top_builddir)/config.h \ - -I$(builddir)/lib -I$(srcdir)/obexd/src +obexd_client_obex_client_CPPFLAGS = -I$(builddir)/lib -I$(srcdir)/obexd/src \ + -I$(srcdir)/btio -I$(srcdir)/gobex \ + -I$(srcdir)/gdbus obexd_client_obex_client_SHORTNAME = obex-client -- cgit v1.2.1