diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-08 01:37:34 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-08 01:37:34 +0000 |
| commit | d4f48636cc2631625434326e146d04f503d0247a (patch) | |
| tree | a371a2337bddce3de3fa3fcac52275a8204570d9 /kitchensync/libqopensync/Makefile.am | |
| parent | d8b40941f9d1a221add0b9094eb09405a91a8aab (diff) | |
| download | tdepim-d4f48636cc2631625434326e146d04f503d0247a.tar.gz tdepim-d4f48636cc2631625434326e146d04f503d0247a.zip | |
Reverse OpenSync patch as it causes a build failure on Debian
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1172771 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kitchensync/libqopensync/Makefile.am')
| -rw-r--r-- | kitchensync/libqopensync/Makefile.am | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/kitchensync/libqopensync/Makefile.am b/kitchensync/libqopensync/Makefile.am index 772146a47..2e12df6ca 100644 --- a/kitchensync/libqopensync/Makefile.am +++ b/kitchensync/libqopensync/Makefile.am @@ -2,20 +2,16 @@ INCLUDES = -I$(top_srcdir)/kitchensync/src \ -I$(top_srcdir)/kitchensync \ -I$(top_srcdir) \ $(OPENSYNC_CFLAGS) \ - $(GLIB_CFLAGS) \ + $(OPENSYNCENGINE_CFLAGS) \ $(all_includes) lib_LTLIBRARIES = libqopensync.la -libqopensync_la_SOURCES = callbackhandler.cpp engine.cpp groupenv.cpp pluginenv.cpp filter.cpp group.cpp \ +libqopensync_la_SOURCES = callbackhandler.cpp conversion.cpp engine.cpp environment.cpp filter.cpp group.cpp \ member.cpp plugin.cpp result.cpp syncmapping.cpp syncupdates.cpp \ syncchange.cpp - -# FIXME: -no-undefined break the build for some unkown reason - libopensync broken?! -#libqopensync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -libqopensync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -libqopensync_la_LIBADD = $(LIB_KDEUI) $(OPENSYNC_LIBS) - +libqopensync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined +libqopensync_la_LIBADD = $(LIB_KDEUI) $(OPENSYNC_LIBS) $(OPENSYNCENGINE_LIBS) METASOURCES = AUTO |