| OLD | NEW |
| 1 EXTRA_DIST = README echo-introspect.xml | 1 EXTRA_DIST = README echo-introspect.xml |
| 2 | 2 |
| 3 if CROSS_COMPILING |
| 4 dbusxx_xml2cpp = dbusxx-xml2cpp |
| 5 else |
| 6 dbusxx_xml2cpp = $(top_builddir)/tools/dbusxx-xml2cpp |
| 7 endif |
| 8 |
| 3 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include | 9 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include |
| 4 | 10 |
| 5 noinst_PROGRAMS = echo-server | 11 noinst_PROGRAMS = echo-server |
| 6 | 12 |
| 7 echo_server_SOURCES = echo-server-glue.h echo-server.h echo-server.cpp | 13 echo_server_SOURCES = echo-server-glue.h echo-server.h echo-server.cpp |
| 8 echo_server_LDADD = $(top_builddir)/src/libdbus-c++-1.la | 14 echo_server_LDADD = $(top_builddir)/src/libdbus-c++-1.la |
| 9 | 15 |
| 10 echo-server-glue.h: echo-introspect.xml | 16 echo-server-glue.h: echo-introspect.xml |
| 11 » $(top_builddir)/tools/dbusxx-xml2cpp $^ --adaptor=$@ | 17 » $(dbusxx_xml2cpp) $^ --adaptor=$@ |
| 12 | 18 |
| 13 noinst_PROGRAMS += echo-client-mt | 19 noinst_PROGRAMS += echo-client-mt |
| 14 | 20 |
| 15 echo_client_mt_SOURCES = echo-client-glue.h echo-client.h echo-client.cpp | 21 echo_client_mt_SOURCES = echo-client-glue.h echo-client.h echo-client.cpp |
| 16 echo_client_mt_LDADD = $(top_builddir)/src/libdbus-c++-1.la @PTHREAD_LIBS@ | 22 echo_client_mt_LDADD = $(top_builddir)/src/libdbus-c++-1.la @PTHREAD_LIBS@ |
| 17 echo_client_mt_CXXFLAGS = @PTHREAD_CFLAGS@ | 23 echo_client_mt_CXXFLAGS = @PTHREAD_CFLAGS@ |
| 18 | 24 |
| 19 echo-client-glue.h: echo-introspect.xml | 25 echo-client-glue.h: echo-introspect.xml |
| 20 » $(top_builddir)/tools/dbusxx-xml2cpp $^ --proxy=$@ | 26 » $(dbusxx_xml2cpp) $^ --proxy=$@ |
| 21 | 27 |
| 22 BUILT_SOURCES = echo-server-glue.h echo-client-glue.h | 28 BUILT_SOURCES = echo-server-glue.h echo-client-glue.h |
| 23 CLEANFILES = $(BUILT_SOURCES) | 29 CLEANFILES = $(BUILT_SOURCES) |
| 24 | 30 |
| 25 dist-hook: | 31 dist-hook: |
| 26 cd $(distdir); rm -f $(BUILT_SOURCES) | 32 cd $(distdir); rm -f $(BUILT_SOURCES) |
| 27 | 33 |
| 28 MAINTAINERCLEANFILES = \ | 34 MAINTAINERCLEANFILES = \ |
| 29 Makefile.in | 35 Makefile.in |
| OLD | NEW |