diff options
| author | Steve Frécinaux <steve@istique.net> | 2006-08-22 19:36:44 +0200 |
|---|---|---|
| committer | Rob Taylor <rob.taylor@collabora.co.uk> | 2006-08-22 20:41:04 +0100 |
| commit | b193f2b28472790ff66fc575d55d4e6d5a9d3e78 (patch) | |
| tree | dcd6c617b38aa4d0715965d5a278e1d62d233a9d /dbus | |
| parent | 3be816118dfc560955e5cd8e85203129087959ce (diff) | |
| download | dbus-glib-b193f2b28472790ff66fc575d55d4e6d5a9d3e78.tar.gz | |
Fix out-of-tree compilation
(cherry picked from 4b85a9e92bcf21356f25c535b3550a330cb018a4 commit)
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/Makefile.am | 13 | ||||
| -rw-r--r-- | dbus/examples/Makefile.am | 8 | ||||
| -rw-r--r-- | dbus/examples/statemachine/Makefile.am | 9 |
3 files changed, 26 insertions, 4 deletions
diff --git a/dbus/Makefile.am b/dbus/Makefile.am index 6a1f76c..2650e8b 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -1,6 +1,13 @@ SUBDIRS = . examples -INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + $(DBUS_CFLAGS) \ + $(DBUS_GLIB_CFLAGS) \ + $(DBUS_GLIB_TOOL_CFLAGS) \ + -DDBUS_COMPILATION=1 \ + -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" lib_LTLIBRARIES=libdbus-glib-1.la @@ -10,7 +17,9 @@ dbus-glib-error-enum.h: make-dbus-glib-error-enum.sh dbus-glib-error-switch.h: make-dbus-glib-error-switch.sh $(LIBTOOL) --mode=execute $(srcdir)/make-dbus-glib-error-switch.sh $(DBUS_INCLUDEDIR)/dbus-1.0/dbus/dbus-protocol.h $@ -BUILT_SOURCES = dbus-glib-error-switch.h dbus-glib-error-enum.h +BUILT_SOURCES = \ + dbus-glib-error-switch.h \ + dbus-glib-error-enum.h CLEANFILES = $(BUILT_SOURCES) diff --git a/dbus/examples/Makefile.am b/dbus/examples/Makefile.am index 1d6a570..bd53ecc 100644 --- a/dbus/examples/Makefile.am +++ b/dbus/examples/Makefile.am @@ -1,6 +1,12 @@ SUBDIRS = . statemachine -INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) -DDBUS_COMPILATION +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + -I$(top_builddir)/dbus \ + $(DBUS_CFLAGS) \ + $(DBUS_GLIB_CFLAGS) \ + -DDBUS_COMPILATION ## Makefile.am bits for sample client/server pair diff --git a/dbus/examples/statemachine/Makefile.am b/dbus/examples/statemachine/Makefile.am index 4529e02..c78af6c 100644 --- a/dbus/examples/statemachine/Makefile.am +++ b/dbus/examples/statemachine/Makefile.am @@ -1,4 +1,11 @@ -INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GTK_THREADS_CFLAGS) -DDBUS_COMPILATION +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + -I$(top_builddir)/dbus \ + $(DBUS_CFLAGS) \ + $(DBUS_GLIB_CFLAGS) \ + $(DBUS_GTK_THREADS_CFLAGS) \ + -DDBUS_COMPILATION ## Makefile.am bits for sample client/server pair |