[f-spot/FSPOT_0_6_0_STABLE] Revert "fix parallel build"
- From: Stephane Delcroix <sdelcroix src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [f-spot/FSPOT_0_6_0_STABLE] Revert "fix parallel build"
- Date: Tue, 15 Sep 2009 11:44:55 +0000 (UTC)
commit faa376fe50337d54a50011e25c888557c39fccd9
Author: Stephane Delcroix <stephane delcroix org>
Date: Tue Sep 15 13:43:21 2009 +0200
Revert "fix parallel build"
This reverts commit 07f2cd2724560b4d7870e553f2900bb7265183e1.
extensions/Exporters/FlickrExport/Makefile.am | 4 ++--
extensions/Exporters/PicasaWebExport/Makefile.am | 4 ++--
extensions/Exporters/SmugMugExport/Makefile.am | 4 ++--
extensions/Exporters/TabbloExport/Makefile.am | 4 ++--
src/Makefile.am | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/extensions/Exporters/FlickrExport/Makefile.am b/extensions/Exporters/FlickrExport/Makefile.am
index 45e23fd..812904c 100644
--- a/extensions/Exporters/FlickrExport/Makefile.am
+++ b/extensions/Exporters/FlickrExport/Makefile.am
@@ -27,7 +27,7 @@ PKGS = \
-pkg:gtk-sharp-2.0 \
-pkg:glade-sharp-2.0
-SUBDIR = \
+SUBDIRS = \
FlickrNet
RESOURCES = \
@@ -40,7 +40,7 @@ mpack: $(PLUGIN_ASSEMBLY)
mautil p $(PLUGIN_ASSEMBLY)
$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- $(MAKE) -C $(SUBDIR)
+ $(MAKE) -C $(SUBDIRS)
$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
plugindir = $(pkglibdir)/extensions
diff --git a/extensions/Exporters/PicasaWebExport/Makefile.am b/extensions/Exporters/PicasaWebExport/Makefile.am
index e123ada..45e3bac 100644
--- a/extensions/Exporters/PicasaWebExport/Makefile.am
+++ b/extensions/Exporters/PicasaWebExport/Makefile.am
@@ -28,7 +28,7 @@ PKGS = \
-pkg:gtk-sharp-2.0 \
-pkg:glade-sharp-2.0
-SUBDIR = \
+SUBDIRS = \
google-sharp
RESOURCES = \
@@ -41,7 +41,7 @@ mpack: $(PLUGIN_ASSEMBLY)
mautil p $(PLUGIN_ASSEMBLY)
$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- $(MAKE) -C $(SUBDIR)
+ $(MAKE) -C $(SUBDIRS)
$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
plugindir = $(pkglibdir)/extensions
diff --git a/extensions/Exporters/SmugMugExport/Makefile.am b/extensions/Exporters/SmugMugExport/Makefile.am
index 2f0dc2b..397461f 100644
--- a/extensions/Exporters/SmugMugExport/Makefile.am
+++ b/extensions/Exporters/SmugMugExport/Makefile.am
@@ -31,7 +31,7 @@ RESOURCES = \
-resource:$(srcdir)/$(PLUGIN_MANIFEST) \
-resource:$(srcdir)/$(PLUGIN_NAME).glade
-SUBDIR = \
+SUBDIRS = \
SmugMugNet
@@ -41,7 +41,7 @@ mpack: $(PLUGIN_ASSEMBLY)
mautil p $(PLUGIN_ASSEMBLY)
$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- $(MAKE) -C $(SUBDIR)
+ $(MAKE) -C $(SUBDIRS)
$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
plugindir = $(pkglibdir)/extensions
diff --git a/extensions/Exporters/TabbloExport/Makefile.am b/extensions/Exporters/TabbloExport/Makefile.am
index acf2d24..b7465d6 100644
--- a/extensions/Exporters/TabbloExport/Makefile.am
+++ b/extensions/Exporters/TabbloExport/Makefile.am
@@ -36,7 +36,7 @@ PKGS = \
-pkg:gtk-sharp-2.0 \
-pkg:glade-sharp-2.0
-SUBDIR = \
+SUBDIRS = \
Tabblo
RESOURCES = \
@@ -50,7 +50,7 @@ mpack: $(PLUGIN_ASSEMBLY)
mautil p $(PLUGIN_ASSEMBLY)
$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- $(MAKE) -C $(SUBDIR)
+ $(MAKE) -C $(SUBDIRS)
$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
plugindir = $(pkglibdir)/extensions
diff --git a/src/Makefile.am b/src/Makefile.am
index ba9bcaf..02add7d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -509,13 +509,13 @@ FSpot.JobScheduler.dll: $(JOBSCHEDULER_CSFILES) FSpot.Utils.dll
FSpot.Bling.dll.mdb: FSpot.Bling.dll
-FSpot.Bling.dll: $(BLING_CSFILES) FSpot.Utils.dll
+FSpot.Bling.dll: $(BLING_CSFILES)
@echo -e "\n*** Compiling $@"
$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(BLING_CSFILES) $(BLING_ASSEMBLIES)
FSpot.Widgets.dll.mdb: FSpot.Widgets.dll
-FSpot.Widgets.dll: $(WIDGETS_CSFILES) FSpot.Utils.dll FSpot.Core.dll Cms.dll
+FSpot.Widgets.dll: $(WIDGETS_CSFILES) FSpot.Utils.dll FSpot.Core.dll
@echo -e "\n*** Compiling $@"
$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(WIDGETS_CSFILES) $(WIDGETS_ASSEMBLIES)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]