Permalink
Browse files

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.
  • Loading branch information...
1 parent a101a61 commit f199ce371d50c92f9701d5ba82e2998aa8e1d66d @bl8 bl8 committed Sep 3, 2012
Showing with 4 additions and 28 deletions.
  1. +4 −0 SparkleShare/Linux/Makefile.am
  2. +0 −28 SparkleShare/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 || :
View
@@ -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 || :

0 comments on commit f199ce3

Please sign in to comment.