[librsvgmm] Get rid of more cruft in source build rules



commit d2bb602b7d5444b543d28c193835291689016117
Author: Daniel Elstner <daniel kitta gmail com>
Date:   Sun Jun 21 16:25:17 2009 +0200

    Get rid of more cruft in source build rules
    
    * tools/build_gmmproc.am: Remove unused parts and reduce the
    levels of indirection a little.

 tools/build_gmmproc.am |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/tools/build_gmmproc.am b/tools/build_gmmproc.am
index a9b66b6..892c491 100644
--- a/tools/build_gmmproc.am
+++ b/tools/build_gmmproc.am
@@ -30,6 +30,7 @@ include $(top_srcdir)/tools/m4/filelist.am
 tools_m4	= $(files_tools_m4:%.m4=$(tools_dir)/m4/%.m4)
 
 include $(srcdir)/filelist.am
+srcdir_files_hg	= $(files_hg:%.hg=$(srcdir)/%.hg)
 files_ccg	= $(files_hg:%.hg=%.ccg)
 files_stamp	= $(files_hg:%.hg=$(stamp_dir)/stamp-%)
 
@@ -38,7 +39,6 @@ run_gmmproc	= $(GMMPROC_DIR)/gmmproc $(gmmproc_args)
 
 gen_wrap_init_path = $(GMMPROC_DIR)/generate_wrap_init.pl
 gen_wrap_init_args = --namespace="$(sublib_namespace)" --parent_dir="$(sublib_parentdir)"
-run_gen_wrap_init  = $(GMMPROC_DIR)/generate_wrap_init.pl $(gen_wrap_init_args)
 
 dist_noinst_DATA = filelist.am $(files_defs) $(files_hg) $(files_ccg)
 
@@ -46,11 +46,8 @@ $(stamp_dir)/stamp-%: %.hg %.ccg $(tools_m4) $(files_defs)
 	$(run_gmmproc) $(notdir $*) $(srcdir) $(gensrc_destdir)
 	@echo timestamp >"$@"
 
-sublib_srcdir      = $(srcdir)/../src
-files_hg_with_path = $(patsubst %.hg,$(sublib_srcdir)/%.hg,$(files_hg))
-
-$(gensrc_destdir)/wrap_init.cc: $(gen_wrap_init_path) $(files_hg_with_path)
-	$(run_gen_wrap_init) $(files_hg:%.hg=$(srcdir)/%.hg) >"$@"
+$(gensrc_destdir)/wrap_init.cc: $(srcdir_files_hg)
+	$(gen_wrap_init_path) $(gen_wrap_init_args) $(srcdir_files_hg) >"$@"
 
 create-stamp-dir:
 	@test -d "$(stamp_dir)" || mkdir "$(stamp_dir)"



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