maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

packaging: remove redundant ADD_EXTRA_PACKAGES 

After adding installation of the extra packages to "make install",
adding them as part of packaging became redundant.
This commit is contained in:
Patrick Ohly 2014-01-06 08:25:19 -08:00
parent 3b528ec6d0
commit daa4bc7d27
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.am
View File

@ -68,13 +68,6 @@ DEV_FILE_PATTERN = $(1)$(2)/include $(1)$(2)/lib/*.so $(1)$(2)/lib/*.a $(1)$(2)/
# be packaged separately.
DEV_FILE_PATTERN += $(1)$(2)/lib/syncevolution/backends/syncactivesync.so
# It is possible to have additional .so backend files included in the
# binary archives. The additional backend files must be named in the
# EXTRA_BACKENDS env or make variable with their full file paths,
# separated by spaces. They will be renamed to <basename>-2.so. See
# also ScannedBackends in SyncSource.cpp.
ADD_EXTRA_BACKENDS = set -e; for i in $(EXTRA_BACKENDS); do cp $$i $(1)/$(BACKENDS_DIRECTORY)/`basename $$i .so`-2.so; done
# binary distribution as .tar.gz
if COND_DBUS
# when building with D-Bus, we have no choice: the service has to go into /usr
@ -90,7 +83,6 @@ distbin : $(distbin_docs) INSTALL-tar-gz all
mkdir -p $(distdir)/usr/share/doc/syncevolution
cp $(srcdir)/INSTALL-tar-gz $(distdir)/INSTALL
cp $(filter-out all, $+) $(distdir)/usr/share/doc/syncevolution
$(call ADD_EXTRA_BACKENDS, $(distdir))
tar zcf $(distdir)-$(BINSUFFIX).tar.gz $(distdir)
rm -rf $(distdir)
else
@ -104,7 +96,6 @@ distbin : $(distbin_docs) all
rm -rf $(call DEV_FILE_PATTERN,$(distdir),/)
for i in `find $(distdir) -type d | sort -r`; do rmdir $$i 2>/dev/null || true; done
cp $(filter-out all, $+) $(distdir)
$(call ADD_EXTRA_BACKENDS, $(distdir))
tar zcf $(distdir)-$(BINSUFFIX).tar.gz $(distdir)
rm -rf $(distdir)
endif
@ -260,7 +251,6 @@ checkinstall/dist/$(distdir): all
rm -rf $@
$(MAKE) install DESTDIR=`pwd`/$@
$(MAKE) installcheck DESTDIR=`pwd`/$@
$(call ADD_EXTRA_BACKENDS, $@)
rm -rf $(call DEV_FILE_PATTERN,$@,/usr)
clean-local: clean_dist
clean_dist: