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.
This commit is contained in:
Bertrand Lorentz 2012-09-03 22:13:31 +02:00
parent b8921975f8
commit 1ecbc3ba95
2 changed files with 4 additions and 28 deletions

View file

@ -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 || :

View file

@ -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 || :