diff options
| author | Lucas De Marchi <lucas.de.marchi@gmail.com> | 2012-12-05 09:22:50 -0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-12-05 17:18:07 +0200 |
| commit | 8a03376544b046a84301847d1594f6c3674983ff (patch) | |
| tree | c8c6210bbc47b8d550f12f45fbeba18f64edb83d /Makefile.obexd | |
| parent | b84f6f794bd407699bf61884ca6eb54cf896c965 (diff) | |
| download | bluez-8a03376544b046a84301847d1594f6c3674983ff.tar.gz | |
Ensure config.h is included by using CPPFLAGS
Instead of trying to include config.h in each file over the tree and
possibly forgetting to include it, give a "-include config.h" argument
to the compiler so it's guaranteed that a) it will be included for all
source files and b) it will be the first header included.
gdbus/ directory is left out, since it would break other projects using
it.
Diffstat (limited to 'Makefile.obexd')
| -rw-r--r-- | Makefile.obexd | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.obexd b/Makefile.obexd index cbcd65db8..f8798f6b1 100644 --- a/Makefile.obexd +++ b/Makefile.obexd @@ -29,7 +29,8 @@ obexd_src_obexd_CFLAGS = @GLIB_CFLAGS@ @DBUS_CFLAGS@ \ -DPLUGINDIR=\""$(obex_plugindir)"\" \ -fPIC -D_FILE_OFFSET_BITS=64 -obexd_src_obexd_CPPFLAGS = -I$(builddir)/lib -I$(builddir)/obexd/src \ +obexd_src_obexd_CPPFLAGS = -include $(top_builddir)/config.h -I$(builddir)/lib \ + -I$(builddir)/obexd/src \ -I$(srcdir)/obexd/src -I$(srcdir)/btio \ -I$(srcdir)/gobex -I$(srcdir)/gdbus @@ -76,7 +77,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 = -I$(builddir)/lib -I$(srcdir)/obexd/src \ +obexd_client_obex_client_CPPFLAGS = -include $(top_builddir)/config.h \ + -I$(builddir)/lib -I$(srcdir)/obexd/src \ -I$(srcdir)/btio -I$(srcdir)/gobex \ -I$(srcdir)/gdbus |