From f199ce371d50c92f9701d5ba82e2998aa8e1d66d Mon Sep 17 00:00:00 2001 From: Bertrand Lorentz Date: Mon, 3 Sep 2012 22:13:31 +0200 Subject: [PATCH] build: Fix build with parallel make Duplicating the build stuff in both SparkleShare/Linux/Makefile.am and SparkleShare/Makefile.am means that SparkleShare.exe will be built twice. This is useless, and fails when using parallel make (make -j2). The part that builds and installs SparkleShare.exe on Linux is now only in SparkleShare/Linux/Makefile.am. --- SparkleShare/Linux/Makefile.am | 4 ++++ SparkleShare/Makefile.am | 28 ---------------------------- 2 files changed, 4 insertions(+), 28 deletions(-) diff --git a/SparkleShare/Linux/Makefile.am b/SparkleShare/Linux/Makefile.am index 05939757..7a2a9b87 100644 --- a/SparkleShare/Linux/Makefile.am +++ b/SparkleShare/Linux/Makefile.am @@ -40,3 +40,7 @@ bin_SCRIPTS = sparkleshare Applicationsdir = $(datadir)/applications dist_Applications_DATA = sparkleshare.desktop \ sparkleshare-invite-opener.desktop + +install-data-hook: + test -f $(datadir)/applications/defaults.list && \ + test -z $(DESTDIR) && update-desktop-database $(datadir)/applications || : diff --git a/SparkleShare/Makefile.am b/SparkleShare/Makefile.am index 823dae1c..a53148d1 100755 --- a/SparkleShare/Makefile.am +++ b/SparkleShare/Makefile.am @@ -1,30 +1,2 @@ SUBDIRS = Linux \ Common - -ASSEMBLY = SparkleShare -TARGET = exe - -LINK = $(REF_SPARKLESHARE) $(NOTIFY_SHARP_LIBS) $(WEBKIT_SHARP_LIBS) - -if HAVE_APP_INDICATOR -BUILD_DEFINES="-define:HAVE_APP_INDICATOR" -endif - -SOURCES = \ - Program.cs \ - SparkleAboutController.cs \ - SparkleBubblesController.cs \ - SparkleControllerBase.cs \ - SparkleEventLogController.cs \ - SparkleExtensions.cs \ - SparkleInvite.cs \ - SparkleKeys.cs \ - SparklePlugin.cs \ - SparkleSetupController.cs \ - SparkleStatusIconController.cs - -include $(top_srcdir)/build/build.mk - -install-data-hook: - test -f $(datadir)/applications/defaults.list && \ - test -z $(DESTDIR) && update-desktop-database $(datadir)/applications || :