Hello Ove!

In the following commit you changed the rule for syncevo-webdav-lookup:

commit ff97574d7026a008efa79bdc8a46c7fc6688d218
Author: Ove Kåven <[email protected]>
Date:   Sat Aug 11 12:11:30 2012 +0200

    Fixed broken rule for creating syncevo-webdav-lookup.

 src/backends/webdav/syncevo-webdav-lookup:
$(srcdir)/src/backends/webdav/syncevo-webdav-lookup.sh
        $(AM_V_GEN)rm -f $@ ; \
-       ln -s $< $@
+       cd src/backends/webdav && ln -s $(notdir $<) $(notdir $@)

I noticed recently that this broke out-of-tree compilation, causing
syncevolution.org binaries to not have the script anymore.

Do you remember why the rule was broken for you? It works for me. Could
it be that srcdir was empty?

Guido fixed something like that for builddir:

commit 85fca619139a27016503fe8f312b9fcc870dc563
Author: Guido Günther <[email protected]>
Date:   Sat May 18 19:14:39 2013 +0200

    build: use top_builddir instead of builddir
    
    when building syncevo-local-sync. Maemo's old automake doesn't now
    about builddir.
    
    This only fixes the one occurence relevant to Maemo.

diff --git a/src/src.am b/src/src.am
index 8da50e2..5505b07 100644
--- a/src/src.am
+++ b/src/src.am
@@ -183,7 +183,7 @@ src_syncevo_local_sync_LDADD = 
$(gdbus_build_dir)/libgdbussyncevo.la $(CORE_LDAD
 src_syncevo_local_sync_CPPFLAGS = -DHAVE_CONFIG_H -I$(gdbus_dir) 
$(src_cppflags)
 src_syncevo_local_sync_CXXFLAGS = $(PCRECPP_CFLAGS) $(SYNCEVOLUTION_CXXFLAGS) 
$(CORE_CXXFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(LIBSOUP_CFLAGS) 
$(SYNCEVO_WFLAGS)
 src_syncevo_local_sync_LDFLAGS = $(PCRECPP_LIBS) $(CORE_LD_FLAGS) 
$(LIBSOUP_LIBS)
-src_syncevo_local_sync_DEPENDENCIES = 
$(builddir)/$(gdbus_build_dir)/libgdbussyncevo.la $(EXTRA_LTLIBRARIES) 
$(CORE_DEP) $(SYNTHESIS_DEP)
+src_syncevo_local_sync_DEPENDENCIES = 
$(top_builddir)/$(gdbus_build_dir)/libgdbussyncevo.la $(EXTRA_LTLIBRARIES) 
$(CORE_DEP) $(SYNTHESIS_DEP)
 
 
 # Do the linking here, as with all SyncEvolution executables.

I'm now wondering why Guido only had to replace $(builddir) in one
place. $(builddir) and $(srcdir) still get used in several places, some
of them relevant for Maemo (?). A global search/replace seems in order
to fix the issue everywhere. With the non-recursive build system used by
SyncEvolution top_builddir == buildir and top_srcdir == srcdir anyway,
the non-top version is just a bit shorter.

Attached a patch for the syncevo-webdav-lookup problem. Does this look
right?

-- 
Best Regards, Patrick Ohly

The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.


>From 03cae410090094cf66a9564db98b9713e7d95245 Mon Sep 17 00:00:00 2001
From: Patrick Ohly <[email protected]>
Date: Fri, 25 Apr 2014 03:21:06 -0700
Subject: [PATCH] WebDAV: fix installation of syncevo-webdav-lookup

The previous change to the syncevo-webdav-lookup broke out-of-tree
compilation because it created a symlink to syncevo-webdav-lookup.sh
inside the current directory, which is not where the file resides when
compiling out-of-tree.

The original problem probably was that $(srcdir) is unset in Maemo's
old automake. We need to use $(top_srcdir) instead.
---
 src/backends/webdav/webdav.am |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/backends/webdav/webdav.am b/src/backends/webdav/webdav.am
index 16539e3..6b35298 100644
--- a/src/backends/webdav/webdav.am
+++ b/src/backends/webdav/webdav.am
@@ -16,9 +16,9 @@ endif
 bin_SCRIPTS += src/backends/webdav/syncevo-webdav-lookup
 CLEANFILES += src/backends/webdav/syncevo-webdav-lookup
 
-src/backends/webdav/syncevo-webdav-lookup: $(srcdir)/src/backends/webdav/syncevo-webdav-lookup.sh
-	$(AM_V_GEN)rm -f $@ ; \
-	cd src/backends/webdav && ln -s $(notdir $<) $(notdir $@)
+src/backends/webdav/syncevo-webdav-lookup: $(top_srcdir)/src/backends/webdav/syncevo-webdav-lookup.sh
+	$(AM_V_GEN)rm -f $@; \
+	ln -s $< $@
 
 src_backends_webdav_src = \
   src/backends/webdav/CalDAVSource.h \
-- 
1.7.10.4

_______________________________________________
SyncEvolution mailing list
[email protected]
https://lists.syncevolution.org/mailman/listinfo/syncevolution

Reply via email to