[pdfmod] Fixes for "make distcheck"
- From: Bertrand Lorentz <blorentz src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [pdfmod] Fixes for "make distcheck"
- Date: Wed, 5 Aug 2009 19:46:58 +0000 (UTC)
commit 03119817c5ab24c7dc677564a88640d74535109b
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date: Wed Aug 5 21:31:57 2009 +0200
Fixes for "make distcheck"
Remove an empty directory from the tarball, and automatically resolve
the path to the dll references.
Makefile.include | 6 ++++--
src/Libraries/PdfSharp/Makefile.am | 4 +---
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/Makefile.include b/Makefile.include
index eb200ad..fbb7371 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -47,8 +47,10 @@ emit_resgen_target_2=$(call q2s,$1) : $(call q2s,$(subst .resources,.resx,$1));
emit_resgen_target=$(if $(filter resgen2,$(RESGEN)),$(emit_resgen_target_2),$(emit_resgen_target_1))
emit_resgen_targets=$(foreach res,$(build_resx_resources_esc),$(eval $(call emit_resgen_target,$(res))))
+DLL_REFERENCES_EXPANDED = $(foreach reference, $(DLL_REFERENCES), $(addprefix $(srcdir)/, $(reference)))
+
build_references_ref = $(call q2s,$(foreach ref, $(call s2q,$(REFERENCES)), $(if $(filter -pkg:%, $(ref)), $(ref), $(if $(filter -r:%, $(ref)), $(ref), -r:$(ref)))))
-build_references_ref += $(call q2s,$(foreach ref, $(call s2q,$(DLL_REFERENCES)), -r:$(ref)))
+build_references_ref += $(call q2s,$(foreach ref, $(call s2q,$(DLL_REFERENCES_EXPANDED)), -r:$(ref)))
build_references_ref += $(call q2s,$(foreach ref, $(call s2q,$(PROJECT_REFERENCES)), -r:$(ref)))
s2q2s=$(call unesc2,$(call s2q,$1))
@@ -113,4 +115,4 @@ $(install_satellite_assembly_list):
install-satellite-assemblies: $(install_satellite_assembly_list)
uninstall-satellite-assemblies:
- rm -rf $(install_satellite_assembly_list)
\ No newline at end of file
+ rm -rf $(install_satellite_assembly_list)
diff --git a/src/Libraries/PdfSharp/Makefile.am b/src/Libraries/PdfSharp/Makefile.am
index 6f828b5..5509a08 100644
--- a/src/Libraries/PdfSharp/Makefile.am
+++ b/src/Libraries/PdfSharp/Makefile.am
@@ -337,9 +337,7 @@ DATA_FILES =
RESOURCES =
-EXTRAS = \
- Resources/images
-
+EXTRAS =
REFERENCES = \
System \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]