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:
parent
a101a6191e
commit
f199ce371d
|
@ -40,3 +40,7 @@ bin_SCRIPTS = sparkleshare
|
||||||
Applicationsdir = $(datadir)/applications
|
Applicationsdir = $(datadir)/applications
|
||||||
dist_Applications_DATA = sparkleshare.desktop \
|
dist_Applications_DATA = sparkleshare.desktop \
|
||||||
sparkleshare-invite-opener.desktop
|
sparkleshare-invite-opener.desktop
|
||||||
|
|
||||||
|
install-data-hook:
|
||||||
|
test -f $(datadir)/applications/defaults.list && \
|
||||||
|
test -z $(DESTDIR) && update-desktop-database $(datadir)/applications || :
|
||||||
|
|
|
@ -1,30 +1,2 @@
|
||||||
SUBDIRS = Linux \
|
SUBDIRS = Linux \
|
||||||
Common
|
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 || :
|
|
||||||
|
|
Loading…
Reference in a new issue