gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r9187 - in Extractor-mono: . LibExtractor


From: gnunet
Subject: [GNUnet-SVN] r9187 - in Extractor-mono: . LibExtractor
Date: Mon, 19 Oct 2009 02:53:14 -0600

Author: patrick
Date: 2009-10-19 02:53:13 -0600 (Mon, 19 Oct 2009)
New Revision: 9187

Modified:
   Extractor-mono/LibExtractor/Makefile
   Extractor-mono/LibExtractor/libextractor.pc.in
   Extractor-mono/Makefile
   Extractor-mono/Makefile.include
   Extractor-mono/rules.make
Log:
* Makefile: regenerated
* rules.make: regenerated
* Makefile.include: regenerated
* LibExtractor/Makefile: regenerated
* LibExtractor/libextractor.pc.in: regenerated

Modified: Extractor-mono/LibExtractor/Makefile
===================================================================
--- Extractor-mono/LibExtractor/Makefile        2009-10-19 08:47:59 UTC (rev 
9186)
+++ Extractor-mono/LibExtractor/Makefile        2009-10-19 08:53:13 UTC (rev 
9187)
@@ -10,8 +10,7 @@
 
 ifeq ($(CONFIG),DEBUG)
 ASSEMBLY_COMPILER_COMMAND = gmcs
-ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+ -debug 
"-define:DEBUG"
-
+ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:3 -optimize- -debug 
"-define:DEBUG"
 ASSEMBLY = bin/Debug/LibExtractor.dll
 ASSEMBLY_MDB = $(ASSEMBLY).mdb
 COMPILE_TARGET = library
@@ -19,12 +18,14 @@
 BUILD_DIR = bin/Debug
 
 LIBEXTRACTOR_DLL_CONFIG_SOURCE=LibExtractor.dll.config
+LIBEXTRACTOR_DLL_MDB_SOURCE=bin/Debug/LibExtractor.dll.mdb
+LIBEXTRACTOR_DLL_MDB=$(BUILD_DIR)/LibExtractor.dll.mdb
 
 endif
 
 ifeq ($(CONFIG),RELEASE)
 ASSEMBLY_COMPILER_COMMAND = gmcs
-ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:4 -optimize+
+ASSEMBLY_COMPILER_FLAGS =  -noconfig -codepage:utf8 -warn:3 -optimize+
 ASSEMBLY = bin/Release/LibExtractor.dll
 ASSEMBLY_MDB = 
 COMPILE_TARGET = library
@@ -32,19 +33,22 @@
 BUILD_DIR = bin/Release
 
 LIBEXTRACTOR_DLL_CONFIG_SOURCE=LibExtractor.dll.config
+LIBEXTRACTOR_DLL_MDB=
 
 endif
 
 AL=al2
-SATELLITE_ASSEMBLY_NAME=.resources.dll
+SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll
 
 PROGRAMFILES = \
-       $(LIBEXTRACTOR_DLL_CONFIG)  
+       $(LIBEXTRACTOR_DLL_CONFIG) \
+       $(LIBEXTRACTOR_DLL_MDB)  
 
 LINUX_PKGCONFIG = \
        $(LIBEXTRACTOR_PC)  
 
 
+RESGEN=resgen2
 
 LIBEXTRACTOR_DLL_CONFIG = $(BUILD_DIR)/LibExtractor.dll.config
 LIBEXTRACTOR_PC = $(BUILD_DIR)/libextractor.pc
@@ -53,10 +57,10 @@
        src/AssemblyInfo.cs \
        src/Extractor.cs \
        src/Keyword.cs \
-       src/KeywordType.cs 
+       src/KeywordType.cs \
+       src/DuplicateOptions.cs 
 
-DATA_FILES = \
-       LibExtractor.dll.config 
+DATA_FILES = 
 
 RESOURCES = 
 
@@ -82,35 +86,39 @@
 $(eval $(call emit-deploy-wrapper,LIBEXTRACTOR_PC,libextractor.pc))
 
 
+$(eval $(call emit_resgen_targets))
 $(build_xamlg_list): %.xaml.g.cs: %.xaml
        xamlg '$<'
 
-$(build_resx_resources) : %.resources: %.resx
-       resgen2 '$<' '$@'
 
 $(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources) 
$(build_datafiles) $(DLL_REFERENCES) $(PROJECT_REFERENCES) $(build_xamlg_list) 
$(build_satellite_assembly_list)
        make pre-all-local-hook prefix=$(prefix)
-       mkdir -p $(dir $(ASSEMBLY))
+       mkdir -p $(shell dirname $(ASSEMBLY))
        make $(CONFIG)_BeforeBuild
        $(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) 
-out:$(ASSEMBLY) -target:$(COMPILE_TARGET) $(build_sources_embed) 
$(build_resources_embed) $(build_references_ref)
        make $(CONFIG)_AfterBuild
        make post-all-local-hook prefix=$(prefix)
 
-install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(LIBEXTRACTOR_DLL_CONFIG) 
$(LIBEXTRACTOR_PC)
+install-local: $(ASSEMBLY) $(ASSEMBLY_MDB)
        make pre-install-local-hook prefix=$(prefix)
-       mkdir -p $(DESTDIR)$(libdir)/$(PACKAGE)
-       cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(DESTDIR)$(libdir)/$(PACKAGE)
-       test -z '$(LIBEXTRACTOR_DLL_CONFIG)' || cp $(LIBEXTRACTOR_DLL_CONFIG) 
$(DESTDIR)$(libdir)/$(PACKAGE)
-       mkdir -p $(DESTDIR)$(libdir)/pkgconfig
-       test -z '$(LIBEXTRACTOR_PC)' || cp $(LIBEXTRACTOR_PC) 
$(DESTDIR)$(libdir)/pkgconfig
+       make install-satellite-assemblies prefix=$(prefix)
+       mkdir -p '$(DESTDIR)$(libdir)/$(PACKAGE)'
+       $(call cp,$(ASSEMBLY),$(DESTDIR)$(libdir)/$(PACKAGE))
+       $(call cp,$(ASSEMBLY_MDB),$(DESTDIR)$(libdir)/$(PACKAGE))
+       $(call cp,$(LIBEXTRACTOR_DLL_CONFIG),$(DESTDIR)$(libdir)/$(PACKAGE))
+       mkdir -p '$(DESTDIR)$(libdir)/pkgconfig'
+       $(call cp,$(LIBEXTRACTOR_PC),$(DESTDIR)$(libdir)/pkgconfig)
+       $(call cp,$(LIBEXTRACTOR_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE))
        make post-install-local-hook prefix=$(prefix)
 
-uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(LIBEXTRACTOR_DLL_CONFIG) 
$(LIBEXTRACTOR_PC)
+uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB)
        make pre-uninstall-local-hook prefix=$(prefix)
-       rm -f $(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY))
-       test -z '$(ASSEMBLY_MDB)' || rm -f 
$(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(ASSEMBLY_MDB))
-       test -z '$(LIBEXTRACTOR_DLL_CONFIG)' || rm -f 
$(DESTDIR)$(libdir)/$(PACKAGE)/$(notdir $(LIBEXTRACTOR_DLL_CONFIG))
-       test -z '$(LIBEXTRACTOR_PC)' || rm -f 
$(DESTDIR)$(libdir)/pkgconfig/$(notdir $(LIBEXTRACTOR_PC))
+       make uninstall-satellite-assemblies prefix=$(prefix)
+       $(call rm,$(ASSEMBLY),$(DESTDIR)$(libdir)/$(PACKAGE))
+       $(call rm,$(ASSEMBLY_MDB),$(DESTDIR)$(libdir)/$(PACKAGE))
+       $(call rm,$(LIBEXTRACTOR_DLL_CONFIG),$(DESTDIR)$(libdir)/$(PACKAGE))
+       $(call rm,$(LIBEXTRACTOR_PC),$(DESTDIR)$(libdir)/pkgconfig)
+       $(call rm,$(LIBEXTRACTOR_DLL_MDB),$(DESTDIR)$(libdir)/$(PACKAGE))
        make post-uninstall-local-hook prefix=$(prefix)
 
 install: install-local

Modified: Extractor-mono/LibExtractor/libextractor.pc.in
===================================================================
--- Extractor-mono/LibExtractor/libextractor.pc.in      2009-10-19 08:47:59 UTC 
(rev 9186)
+++ Extractor-mono/LibExtractor/libextractor.pc.in      2009-10-19 08:53:13 UTC 
(rev 9187)
@@ -1,6 +1,6 @@
 Name: LibExtractor
 Description: LibExtractor
-Version: 0.1
+Version: 
 
 Requires: 
 Libs: -r:@expanded_libdir@/@PACKAGE@/LibExtractor.dll

Modified: Extractor-mono/Makefile
===================================================================
--- Extractor-mono/Makefile     2009-10-19 08:47:59 UTC (rev 9186)
+++ Extractor-mono/Makefile     2009-10-19 08:53:13 UTC (rev 9187)
@@ -5,6 +5,7 @@
 
 top_srcdir=.
 include $(top_srcdir)/config.make
+include $(top_srcdir)/Makefile.include
 include $(top_srcdir)/rules.make
 
 #include $(top_srcdir)/custom-hooks.make
@@ -25,10 +26,10 @@
        case $$2 in --unix) shift ;; esac; \
        case $$2 in *=*) dk="exit 1" ;; *k*) dk=: ;; *) dk="exit 1" ;; esac; \
        make pre-$*-hook prefix=$(prefix) ; \
-       for dir in $(SUBDIRS); do \
-               case $$dir in \
+       for dir in $(call quote_each,$(SUBDIRS)); do \
+               case "$$dir" in \
                .) make $*-local || { final_exit="exit 1"; $$dk; };;\
-               *) (cd $$dir && make $*) || { final_exit="exit 1"; $$dk; };;\
+               *) (cd "$$dir" && make $*) || { final_exit="exit 1"; $$dk; };;\
                esac \
        done; \
        make post-$*-hook prefix=$(prefix) ; \
@@ -46,17 +47,17 @@
        rm -rf $(PACKAGE)-$(VERSION)
        mkdir $(PACKAGE)-$(VERSION)
        make pre-dist-hook distdir=$$distdir
-       for dir in $(SUBDIRS); do \
+       for dir in $(call quote_each,$(SUBDIRS)); do \
                pkgdir=`pwd`/$(PACKAGE)-$(VERSION); \
-               mkdir $$pkgdir/$$dir || true; \
+               mkdir "$$pkgdir/$$dir" || true; \
                case $$dir in \
-               .) make dist-local distdir=$$pkgdir || exit 1;; \
-               *) (cd $$dir; make dist-local distdir=$$pkgdir/$$dir) || exit 
1;; \
+               .) make dist-local "distdir=$$pkgdir" || exit 1;; \
+               *) (cd "$$dir"; make dist-local "distdir=$$pkgdir/$$dir") || 
exit 1;; \
                esac \
        done
        (make dist-local distdir=$(PACKAGE)-$(VERSION))
        make
-       make post-dist-hook distsir=$$distdir
+       make post-dist-hook "distsir=$$distdir"
        tar czvf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
        rm -rf $(PACKAGE)-$(VERSION)
        @echo "=========================================="

Modified: Extractor-mono/Makefile.include
===================================================================
--- Extractor-mono/Makefile.include     2009-10-19 08:47:59 UTC (rev 9186)
+++ Extractor-mono/Makefile.include     2009-10-19 08:53:13 UTC (rev 9187)
@@ -1,37 +1,63 @@
 VALID_CULTURES =   ar bg ca zh-CHS cs da de el en es fi fr he hu is it ja ko 
nl no pl pt ro ru hr sk sq sv th tr id uk be sl et lv lt fa vi hy eu mk af fo 
hi sw gu ta te kn mr gl kok ar-SA bg-BG ca-ES zh-TW cs-CZ da-DK de-DE el-GR 
en-US fi-FI fr-FR he-IL hu-HU is-IS it-IT ja-JP ko-KR nl-NL nb-NO pl-PL pt-BR 
ro-RO ru-RU hr-HR sk-SK sq-AL sv-SE th-TH tr-TR id-ID uk-UA be-BY sl-SI et-EE 
lv-LV lt-LT fa-IR vi-VN hy-AM eu-ES mk-MK af-ZA fo-FO hi-IN sw-KE gu-IN ta-IN 
te-IN kn-IN mr-IN gl-ES kok-IN ar-IQ zh-CN de-CH en-GB es-MX fr-BE it-CH nl-BE 
nn-NO pt-PT sv-FI ar-EG zh-HK de-AT en-AU es-ES fr-CA ar-LY zh-SG de-LU en-CA 
es-GT fr-CH ar-DZ zh-MO en-NZ es-CR fr-LU ar-MA en-IE es-PA ar-TN en-ZA es-DO 
ar-OM es-VE ar-YE es-CO ar-SY es-PE ar-JO es-AR ar-LB en-ZW es-EC ar-KW en-PH 
es-CL ar-AE es-UY ar-BH es-PY ar-QA es-BO es-SV es-HN es-NI es-PR zh-CHT
 
+s2q=$(subst \ ,?,$1)
+q2s=$(subst ?,\ ,$1)
+# use this when result will be quoted
+unesc2=$(subst ?, ,$1)
+
 build_sources = $(FILES) $(GENERATED_FILES)
-build_sources_embed = $(build_sources:%='$(srcdir)/%')
+build_sources_esc= $(call s2q,$(build_sources))
+# use unesc2, as build_sources_embed is quoted
+build_sources_embed= $(call unesc2,$(build_sources_esc:%='$(srcdir)/%'))
 
 comma__=,
 get_resource_name = $(firstword $(subst $(comma__), ,$1))
 get_culture =  $(lastword $(subst ., ,$(basename $1)))
 is_cultured_resource = $(and $(word 3,$(subst ., ,$1)), $(filter 
$(VALID_CULTURES),$(lastword $(subst ., ,$(basename $1)))))
 
-build_resx_list = $(foreach res, $(RESOURCES), $(if $(filter %.resx, $(call 
get_resource_name,$(res))),$(res),))
+RESOURCES_ESC=$(call s2q,$(RESOURCES))
+
+build_resx_list = $(foreach res, $(RESOURCES_ESC), $(if $(filter %.resx, 
$(call get_resource_name,$(res))),$(res),))
 build_non_culture_resx_list = $(foreach res, $(build_resx_list),$(if $(call 
is_cultured_resource,$(call get_resource_name,$(res))),,$(res)))
-build_non_culture_others_list = $(foreach res, $(filter-out 
$(build_resx_list),$(RESOURCES)),$(if $(call is_cultured_resource,$(call 
get_resource_name,$(res))),,$(res)))
+build_non_culture_others_list = $(foreach res, $(filter-out 
$(build_resx_list),$(RESOURCES_ESC)),$(if $(call is_cultured_resource,$(call 
get_resource_name,$(res))),,$(res)))
 build_others_list = $(build_non_culture_others_list)
 build_xamlg_list = $(filter %.xaml.g.cs, $(FILES))
 
 # resgen all .resx resources
 build_resx_files = $(foreach res, $(build_resx_list), $(call 
get_resource_name,$(res)))
-build_resx_resources = $(build_resx_files:.resx=.resources)
+build_resx_resources_esc = $(build_resx_files:.resx=.resources)
+build_resx_resources = $(call q2s,$(build_resx_resources_esc))
 
 # embed resources for the main assembly
 build_resx_resources_hack = $(subst .resx,.resources, 
$(build_non_culture_resx_list))
-build_resx_resources_embed = $(build_resx_resources_hack:%='-resource:%')
-build_others_files = $(foreach res, $(build_others_list),$(call 
get_resource_name,$(res)))
+# use unesc2, as build_resx_resources_embed is quoted
+build_resx_resources_embed = $(call 
unesc2,$(build_resx_resources_hack:%='-resource:%'))
+build_others_files = $(call q2s,$(foreach res, $(build_others_list),$(call 
get_resource_name,$(res))))
 build_others_resources = $(build_others_files)
-build_others_resources_embed = $(build_others_list:%='-resource:$(srcdir)/%')
+# use unesc2, as build_others_resources_embed is quoted
+build_others_resources_embed = $(call 
unesc2,$(build_others_list:%='-resource:$(srcdir)/%'))
 
 build_resources = $(build_resx_resources) $(build_others_resources)
 build_resources_embed = $(build_resx_resources_embed) 
$(build_others_resources_embed)
 
-build_references_ref = $(foreach ref, $(REFERENCES), $(if $(filter -pkg:%, 
$(ref)), $(ref), $(if $(filter -r:%, $(ref)), $(ref), -r:$(ref))))
-build_references_ref += $(foreach ref, $(DLL_REFERENCES), -r:$(ref))
-build_references_ref += $(foreach ref, $(PROJECT_REFERENCES), -r:$(ref))
+# -usesourcepath is available only for resgen2
+emit_resgen_target_1=$(call q2s,$1) : $(call q2s,$(subst 
.resources,.resx,$1)); cd '$$(shell dirname '$$<')' && MONO_IOMAP=drive 
$$(RESGEN) '$$(shell basename '$$<')' '$$(shell basename '$$@')'
+emit_resgen_target_2=$(call q2s,$1) : $(call q2s,$(subst 
.resources,.resx,$1)); MONO_IOMAP=drive $$(RESGEN) -usesourcepath '$$<' '$$@'
 
+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))))
+
+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,$(PROJECT_REFERENCES)), -r:$(ref)))
+
+s2q2s=$(call unesc2,$(call s2q,$1))
+cp_actual=test -z $1 || cp $1 $2
+cp=$(call cp_actual,'$(call s2q2s,$1)','$(call s2q2s,$2)')
+
+rm_actual=test -z '$1' || rm -f '$2'
+rm=$(call rm_actual,$(call s2q2s,$1),$(call s2q2s,$2)/$(shell basename '$(call 
s2q2s,$1)'))
+
 EXTRA_DIST += $(build_sources) $(build_resx_files) $(build_others_files) 
$(ASSEMBLY_WRAPPER_IN) $(EXTRAS) $(DATA_FILES) $(build_culture_res_files)
 CLEANFILES += $(ASSEMBLY) $(ASSEMBLY).mdb $(BINARIES) $(build_resx_resources) 
$(build_satellite_assembly_list)
 DISTCLEANFILES = $(GENERATED_FILES) $(pc_files) $(BUILD_DIR)/*
@@ -50,7 +76,7 @@
 # $(call emit-deploy-target,deploy-variable-name)
 define emit-deploy-target
 $($1): $($1_SOURCE)
-       mkdir -p $$(dir $($1))
+       mkdir -p '$$(shell dirname '$$@')'
        cp '$$<' '$$@'
 endef
 
@@ -59,7 +85,7 @@
 # if $3 is non-empty then wrapper is marked exec
 define emit-deploy-wrapper
 $($1): $2 $(top_srcdir)/config.make
-       mkdir -p '$$(@D)'
+       mkdir -p '$$(shell dirname '$$@')'
        cp '$$<' '$$@'
        $(if $3,chmod +x '$$@')
 
@@ -69,16 +95,26 @@
 
 # generating satellite assemblies
 
-culture_resources = $(foreach res, $(RESOURCES), $(if $(call 
is_cultured_resource,$(call get_resource_name, $(res))),$(res)))
+culture_resources = $(foreach res, $(RESOURCES_ESC), $(if $(call 
is_cultured_resource,$(call get_resource_name, $(res))),$(res)))
 cultures = $(sort $(foreach res, $(culture_resources), $(call 
get_culture,$(call get_resource_name,$(res)))))
-culture_resource_dependencies = $(BUILD_DIR)/$1/$(SATELLITE_ASSEMBLY_NAME): 
$(subst .resx,.resources,$2)
-culture_resource_commandlines = cmd_line_satellite_$1 += '/embed:$(subst 
.resx,.resources,$2)'
-build_satellite_assembly_list = 
$(cultures:%=$(BUILD_DIR)/%/$(SATELLITE_ASSEMBLY_NAME))
-build_culture_res_files = $(foreach res, $(culture_resources),$(call 
get_resource_name,$(res)))
+culture_resource_dependencies = $(call 
q2s,$(BUILD_DIR)/$1/$(SATELLITE_ASSEMBLY_NAME): $(subst .resx,.resources,$2))
+culture_resource_commandlines = $(call unesc2,cmd_line_satellite_$1 += 
'/embed:$(subst .resx,.resources,$2)')
+build_satellite_assembly_list = $(call 
q2s,$(cultures:%=$(BUILD_DIR)/%/$(SATELLITE_ASSEMBLY_NAME)))
+build_culture_res_files = $(call q2s,$(foreach res, 
$(culture_resources),$(call get_resource_name,$(res))))
+install_satellite_assembly_list = $(subst 
$(BUILD_DIR),$(DESTDIR)$(libdir)/$(PACKAGE),$(build_satellite_assembly_list))
 
 $(eval $(foreach res, $(culture_resources), $(eval $(call 
culture_resource_dependencies,$(call get_culture,$(call 
get_resource_name,$(res))),$(call get_resource_name,$(res))))))
 $(eval $(foreach res, $(culture_resources), $(eval $(call 
culture_resource_commandlines,$(call get_culture,$(call 
get_resource_name,$(res))),$(res)))))
 
 $(build_satellite_assembly_list): $(BUILD_DIR)/%/$(SATELLITE_ASSEMBLY_NAME):
        mkdir -p '$(@D)'
-       $(AL) -out:'$@' -culture:$* -t:lib $(cmd_line_satellite_$*)
\ No newline at end of file
+       $(AL) -out:'$@' -culture:$* -t:lib $(cmd_line_satellite_$*)
+
+$(install_satellite_assembly_list):
+       mkdir -p '$(@D)'
+       cp $(subst $(DESTDIR)$(libdir)/$(PACKAGE), $(BUILD_DIR), $@) $@
+
+install-satellite-assemblies: $(install_satellite_assembly_list)
+       
+uninstall-satellite-assemblies:
+       rm -rf $(install_satellite_assembly_list)
\ No newline at end of file

Modified: Extractor-mono/rules.make
===================================================================
--- Extractor-mono/rules.make   2009-10-19 08:47:59 UTC (rev 9186)
+++ Extractor-mono/rules.make   2009-10-19 08:53:13 UTC (rev 9187)
@@ -1,30 +1,32 @@
 clean-local:
        make pre-clean-local-hook
        make $(CONFIG)_BeforeClean
-       -rm -f $(CLEANFILES)
+       -rm -f $(call quote_each,$(CLEANFILES))
        make $(CONFIG)_AfterClean
        make post-clean-local-hook
 
 install-local:
 uninstall-local:
 
+q2quote = '$(subst ?, ,$1)'
+quote_each = $(foreach f,$(call s2q,$1),$(call q2quote,$f))
+
 dist-local:
-       make pre-dist-local-hook distdir=$$distdir
-       list='$(EXTRA_DIST)'; \
-       for f in Makefile $$list; do \
+       make pre-dist-local-hook "distdir=$$distdir"
+       for f in Makefile $(call quote_each,$(EXTRA_DIST)); do \
                d=`dirname "$$f"`; \
                test -d "$(distdir)/$$d" || \
                        mkdir -p "$(distdir)/$$d"; \
                cp -p "$$f" "$(distdir)/$$d" || exit 1; \
        done
-       make post-dist-local-hook distdir=$$distdir
+       make post-dist-local-hook "distdir=$$distdir"
 
 dist-local-recursive:
-       for dir in $(SUBDIRS); do \
-               mkdir -p $(distdir)/$$dir || true; \
-               case $$dir in \
-               .) make dist-local distdir=$(distdir) || exit 1;; \
-               *) (cd $$dir; make dist-local distdir=$(distdir)/$$dir) || exit 
1; \
+       for dir in $(call quote_each,$(SUBDIRS)); do \
+               mkdir -p "$(distdir)/$$dir" || true; \
+               case "$$dir" in \
+               .) make dist-local "distdir=$(distdir)" || exit 1;; \
+               *) (cd "$$dir"; make dist-local "distdir=$(distdir)/$$dir") || 
exit 1; \
                esac \
        done
 





reply via email to

[Prev in Thread] Current Thread [Next in Thread]