blob: f69b1c47f343f060f001c7629df15c3d2175f0bf (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
--- ./src/integration/ecore/Makefile.am.link 2012-07-28 07:29:07.000000000 +0000
+++ ./src/integration/ecore/Makefile.am 2012-07-28 07:29:34.000000000 +0000
@@ -11,6 +11,7 @@
-Wno-unused-parameter
libdbus_c___ecore_1_la_LIBADD = \
+ $(top_builddir)/src/libdbus-c++-1.la \
$(dbus_LIBS) \
$(ecore_LIBS)
--- ./src/Makefile.am.link 2012-07-28 07:28:42.000000000 +0000
+++ ./src/Makefile.am 2012-07-28 07:28:54.000000000 +0000
@@ -36,7 +36,7 @@
$(glib_CFLAGS) \
$(ecore_CFLAGS)
-SUBDIRS = \
+SUBDIRS = . \
integration
HEADER_DIR = $(top_srcdir)/include/dbus-c++
--- ./src/integration/glib/Makefile.am.link 2012-07-28 07:36:02.000000000 +0000
+++ ./src/integration/glib/Makefile.am 2012-07-28 07:36:53.000000000 +0000
@@ -11,6 +11,7 @@
-Wno-unused-parameter
libdbus_c___glib_1_la_LIBADD = \
+ $(top_builddir)/src/libdbus-c++-1.la \
$(dbus_LIBS) \
$(glib_LIBS)
--- ./examples/glib/Makefile.am.link 2012-07-28 07:53:24.000000000 +0000
+++ ./examples/glib/Makefile.am 2012-07-28 07:53:54.000000000 +0000
@@ -8,7 +8,7 @@
dbus_browser_SOURCES = dbus-glue.h dbus-browser.h dbus-browser.cpp $(top_srcdir)/tools/xml.cpp
dbus_browser_LDADD = $(top_builddir)/src/integration/glib/libdbus-c++-glib-1.la \
- $(top_builddir)/src/libdbus-c++-1.la $(gtkmm_LIBS)
+ $(top_builddir)/src/libdbus-c++-1.la $(gtkmm_LIBS) $(xml_LIBS)
dbus-glue.h: $(top_srcdir)/data/org.freedesktop.DBus.xml
$(top_builddir)/tools/dbusxx-xml2cpp $^ --proxy=$@
--- ./test/functional/Test1/Makefile.am.link 2012-07-28 08:10:06.000000000 +0000
+++ ./test/functional/Test1/Makefile.am 2012-07-28 08:10:36.000000000 +0000
@@ -34,6 +34,7 @@
$(RT_LIBS)
TestApp_CXXFLAGS = \
+ $(PTHREAD_CFLAGS) \
-I$(top_srcdir)/include
AM_CPPFLAGS =
|
