[pdfmod] Fix another minor parallel make issue
- From: Bertrand Lorentz <blorentz src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [pdfmod] Fix another minor parallel make issue
- Date: Fri, 14 Aug 2009 18:14:38 +0000 (UTC)
commit b1439a105f9873518bec966723351f642bbc74af
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date: Fri Aug 14 20:09:42 2009 +0200
Fix another minor parallel make issue
This would cause the compilation rules to be called twice. As the
Makefiles were generated by MonoDevelop, the underlying issue has been
filed as BNC#531349.
lib/PdfSharp/Makefile.am | 4 +++-
src/Makefile.am | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/lib/PdfSharp/Makefile.am b/lib/PdfSharp/Makefile.am
index e5158c8..378c9de 100644
--- a/lib/PdfSharp/Makefile.am
+++ b/lib/PdfSharp/Makefile.am
@@ -353,6 +353,8 @@ $(eval $(call emit_resgen_targets))
$(build_xamlg_list): %.xaml.g.cs: %.xaml
xamlg '$<'
-$(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list) $(build_satellite_assembly_list)
+$(ASSEMBLY_MDB): $(ASSEMBLY)
+
+$(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list) $(build_satellite_assembly_list)
mkdir -p $(shell dirname $(ASSEMBLY))
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
diff --git a/src/Makefile.am b/src/Makefile.am
index 42b280c..20aee01 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -158,6 +158,8 @@ $(eval $(call emit_resgen_targets))
$(build_xamlg_list): %.xaml.g.cs: %.xaml
xamlg '$<'
-$(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list) $(build_satellite_assembly_list)
+$(ASSEMBLY_MDB): $(ASSEMBLY)
+
+$(ASSEMBLY): $(build_sources) $(build_resources) $(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list) $(build_satellite_assembly_list)
mkdir -p $(shell dirname $(ASSEMBLY))
$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) $(build_resources_embed) $(build_references_ref)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]