diff options
| author | Patrick Ohly <patrick.ohly@intel.com> | 2010-03-29 22:13:45 +0200 |
|---|---|---|
| committer | Patrick Ohly <patrick.ohly@intel.com> | 2010-03-29 22:13:45 +0200 |
| commit | a388d4de1f5d5dcb5b8b4572d63beba0dad390a5 (patch) | |
| tree | 8de34117fcda6401a8e2b8c7409e34bf069a2ac8 | |
| parent | c41b90397848eb4524171ddc5ea6ea7240d7f610 (diff) | |
command line + D-Bus: fixed compile problems
signal.h must be included in syncevolution.cpp.
DBUS_CFLAGS/CXXFLAGS are also needed for it now.
| -rw-r--r-- | src/Makefile-gen.am | 4 | ||||
| -rw-r--r-- | src/syncevolution.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/Makefile-gen.am b/src/Makefile-gen.am index 86d51972..273f615a 100644 --- a/src/Makefile-gen.am +++ b/src/Makefile-gen.am @@ -123,8 +123,8 @@ endif # if linking statically against them, empty otherwise; # either way this does not lead to a dependency on those libs - done explicitly syncevolution_LDADD = gdbus/libgdbus.la $(CORE_LDADD) $(KEYRING_LIBS) -syncevolution_LDFLAGS = $(CORE_LD_FLAGS) -syncevolution_CXXFLAGS = $(SYNCEVOLUTION_CXXFLAGS) $(CORE_CXXFLAGS) $(KEYRING_CFLAGS) -I$(srcdir)/gdbus +syncevolution_LDFLAGS = $(CORE_LD_FLAGS) $(DBUS_LIBS) +syncevolution_CXXFLAGS = $(SYNCEVOLUTION_CXXFLAGS) $(CORE_CXXFLAGS) $(KEYRING_CFLAGS) -I$(srcdir)/gdbus $(DBUS_CFLAGS) syncevolution_DEPENDENCIES = $(EXTRA_LTLIBRARIES) $(CORE_DEP) # $(SYNTHESIS_DEP) # rule which is only relevant when compiling Synthesis in subdirectory diff --git a/src/syncevolution.cpp b/src/syncevolution.cpp index 41bc6925..5431002e 100644 --- a/src/syncevolution.cpp +++ b/src/syncevolution.cpp @@ -36,6 +36,7 @@ using namespace std; #include "CmdlineSyncClient.h" #include <dlfcn.h> +#include <signal.h> #include <syncevo/declarations.h> |