[asterisk-commits] kpfleming: branch kpfleming/multimodule-build r114016 - /team/kpfleming/multi...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed Apr 9 19:09:50 CDT 2008


Author: kpfleming
Date: Wed Apr  9 19:09:49 2008
New Revision: 114016

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114016
Log:
break up this monster Make into logical components

Added:
    team/kpfleming/multimodule-build/astbuild/Makefile.base
      - copied, changed from r114015, team/kpfleming/multimodule-build/astbuild/Makefile.core
    team/kpfleming/multimodule-build/astbuild/Makefile.menuselect
      - copied, changed from r114015, team/kpfleming/multimodule-build/astbuild/Makefile.core
    team/kpfleming/multimodule-build/astbuild/Makefile.modlist
      - copied, changed from r114015, team/kpfleming/multimodule-build/astbuild/Makefile.core
Removed:
    team/kpfleming/multimodule-build/astbuild/Makefile.core

Copied: team/kpfleming/multimodule-build/astbuild/Makefile.base (from r114015, team/kpfleming/multimodule-build/astbuild/Makefile.core)
URL: http://svn.digium.com/view/asterisk/team/kpfleming/multimodule-build/astbuild/Makefile.base?view=diff&rev=114016&p1=team/kpfleming/multimodule-build/astbuild/Makefile.core&r1=114015&p2=team/kpfleming/multimodule-build/astbuild/Makefile.base&r2=114016
==============================================================================
--- team/kpfleming/multimodule-build/astbuild/Makefile.core (original)
+++ team/kpfleming/multimodule-build/astbuild/Makefile.base Wed Apr  9 19:09:49 2008
@@ -6,17 +6,8 @@
 # to hold that directory's name
 astbuild_dir = .astbuild
 
-all:: $(astbuild_dir)
-
-clean::
-	rm -f *.o *.oo
-	rm -f *.so *.a
-	rm -f built-in.o built-in.oo
-
-dist-clean:: clean
+dist-clean::
 	@rm -rf $(astbuild_dir)
-
-distclean: dist-clean
 
 $(astbuild_dir):
 	@mkdir $@
@@ -33,203 +24,3 @@
 # list of module names to build
 mods-m :=
 mods-y :=
-
-include Makefile.astbuild
-
-# lists of module names (all modules, using virtual names for modules that have them)
-all-mods-c :=
-all-mods-cc :=
-all-multi-mods = $(all-multi-mods-c) $(all-multi-mods-cc)
-all-single-mods = $(all-single-mods-c) $(all-single-mods-cc)
-all-multi-mods-c :=
-all-multi-mods-cc :=
-all-single-mods-c :=
-all-single-mods-cc :=
-
-# lists of module names (modules to build)
-mods-c-m = $(single-mods-c-m) $(multi-mods-c-m)
-mods-c-y = $(single-mods-c-y) $(multi-mods-c-y)
-mods-cc-m = $(single-mods-cc-m) $(multi-mods-cc-m)
-mods-cc-y = $(single-mods-cc-y) $(multi-mods-cc-y)
-
-# lists of module names (multi-component modules)
-multi-mods = $(multi-mods-m) $(multi-mods-y)
-multi-mods-m = $(multi-mods-c-m) $(multi-mods-cc-m)
-multi-mods-y = $(multi-mods-c-y) $(multi-mods-cc-y)
-multi-mods-c-m :=
-multi-mods-c-y :=
-multi-mods-cc-m :=
-multi-mods-cc-y :=
-
-# lists of module names (single-component modules)
-single-mods = $(single-mods-m) $(single-mods-y)
-single-mods-m = $(single-mods-c-m) $(single-mods-cc-m)
-single-mods-y = $(single-mods-c-y) $(single-mods-cc-y)
-single-mods-c-m :=
-single-mods-c-y :=
-single-mods-cc-m :=
-single-mods-cc-y :=
-
-# lists of object names (all objects)
-objs-m = $(single-objs-m) $(multi-objs-m)
-objs-y = $(single-objs-y) $(multi-objs-y)
-objs-c-m = $(single-objs-c-m) $(multi-objs-c-m)
-objs-c-y = $(single-objs-c-y) $(multi-objs-c-y)
-objs-cc-m = $(single-objs-cc-m) $(multi-objs-cc-m)
-objs-cc-y = $(single-objs-cc-y) $(multi-objs-cc-y)
-
-# lists of object names (objects in multi-component modules)
-multi-objs = $(multi-objs-m) $(multi-objs-y)
-multi-objs-m = $(multi-objs-c-m) $(multi-objs-cc-m)
-multi-objs-y = $(multi-objs-c-y) $(multi-objs-cc-y)
-multi-objs-c = $(multi-objs-c-m) $(multi-objs-c-y)
-multi-objs-cc = $(multi-objs-cc-m) $(multi-objs-cc-y)
-multi-objs-c-m :=
-multi-objs-c-y :=
-multi-objs-cc-m :=
-multi-objs-cc-y :=
-
-# lists of object names (objects in single-component modules)
-single-objs = $(single-objs-m) $(single-objs-y)
-single-objs-m = $(single-objs-c-m) $(single-objs-cc-m)
-single-objs-y = $(single-objs-c-y) $(single-objs-cc-y)
-single-objs-c = $(single-objs-c-m) $(single-objs-c-y)
-single-objs-cc = $(single-objs-cc-m) $(single-objs-cc-y)
-single-objs-c-m :=
-single-objs-c-y :=
-single-objs-cc-m :=
-single-objs-cc-y :=
-
-# find all multi-component C modules in all-mods and move them to all-mods-c
-all-mods-c := $(strip $(foreach mod,$(all-mods),$(if $(filter %.o,$($(mod))),$(mod))))
-# find all multi-component CC modules in all-mods and move them to all-mods-cc
-all-mods-cc := $(strip $(foreach mod,$(all-mods),$(if $(filter %.oo,$($(mod))),$(mod))))
-
-# find all available C modules that aren't already known
-ifneq ($(MODULE_PREFIX),)
-  # scan for matching C sources which could be modules
-  found-mods-c := $(patsubst %.c,%,$(wildcard $(MODULE_PREFIX)_*.c))
-  # remove anything already in all-mods
-  found-mods-c := $(filter-out $(all-mods),$(found-mods-c))
-  # remove anything that is a component of any module in all-mods-c
-  found-mods-c := $(filter-out $(foreach mod,$(all-mods-c),$(patsubst %.o,%,$($(mod)))),$(found-mods-c))
-endif
-
-# find all available CC modules that aren't already known
-ifneq ($(MODULE_PREFIX),)
-  # scan for matching CC sources which could be modules
-  found-mods-cc := $(patsubst %.cc,%,$(wildcard $(MODULE_PREFIX)_*.cc))
-  # remove anything already in all-mods
-  found-mods-cc := $(filter-out $(all-mods),$(found-mods-cc))
-  # remove anything that is a component of any module in all-mods-cc
-  found-mods-cc := $(filter-out $(foreach mod,$(all-mods-cc),$(patsubst %.oo,%,$($(mod)))),$(found-mods-cc))
-endif
-
-# now rebuild the list of *all* modules to include the ones we found
-all-mods-c := $(sort $(all-mods-c) $(found-mods-c))
-all-mods-cc := $(sort $(all-mods-cc) $(found-mods-cc))
-
-all-mods := $(sort $(all-mods-c) $(all-mods-cc))
-
-# generate lists of all known modules, separated by source type and build type
-all-multi-mods-c := $(sort $(foreach mod,$(all-mods-c),$(if $($(mod)),$(mod))))
-all-multi-mods-cc := $(sort $(foreach mod,$(all-mods-cc),$(if $($(mod)),$(mod))))
-all-single-mods-c := $(filter-out $(all-multi-mods-c),$(all-mods-c))
-all-single-mods-cc := $(filter-out $(all-multi-mods-cc),$(all-mods-cc))
-
-# compute the list of modules that will be built as loadable
-#  (the subdirectory makefile will only ever specify the ones
-#   not to build at all, or to build as built-in)
-mods-m += $(filter-out $(mods-y) $(mods-n),$(all-mods))
-
-# generate the lists of multi-component modules to be built
-multi-mods-c-m := $(filter-out $(mods-y) $(mods-n),$(all-multi-mods-c))
-multi-mods-c-y := $(filter-out $(mods-m) $(mods-n),$(all-multi-mods-c))
-multi-mods-cc-m := $(filter-out $(mods-y) $(mods-n),$(all-multi-mods-cc))
-multi-mods-cc-y := $(filter-out $(mods-m) $(mods-n),$(all-multi-mods-cc))
-
-# generate the lists of single component modules to be built
-single-mods-c-m := $(filter-out $(mods-y) $(mods-n),$(all-single-mods-c))
-single-mods-c-y := $(filter-out $(mods-m) $(mods-n),$(all-single-mods-c))
-single-mods-cc-m := $(filter-out $(mods-y) $(mods-n),$(all-single-mods-cc))
-single-mods-cc-y := $(filter-out $(mods-m) $(mods-n),$(all-single-mods-cc))
-
-# generate the lists of multi-component module object files
-multi-objs-c-m := $(sort $(foreach mod,$(multi-mods-c-m),$($(mod))))
-multi-objs-c-y := $(sort $(foreach mod,$(multi-mods-c-y),$($(mod))))
-multi-objs-cc-m := $(sort $(foreach mod,$(multi-mods-cc-m),$($(mod))))
-multi-objs-cc-y := $(sort $(foreach mod,$(multi-mods-cc-y),$($(mod))))
-
-# generate the lists of single component module object files
-single-objs-c-m := $(single-mods-c-m:%=%.o)
-single-objs-c-y := $(single-mods-c-y:%=%.o)
-single-objs-cc-m := $(single-mods-cc-m:%=%.oo)
-single-objs-cc-y := $(single-mods-cc-y:%=%.oo)
-
-# function: module-base
-#
-# get the base file for a module, the one that contains its dependency
-# and other build-related information; this will be either the
-# file with the same name as the module, or the first component of its
-# component list if it is a multi-component module
-#
-module-base = $(if $($(1)),$(basename $(firstword $($(1)))),$(1))
-
-# function: module-bases
-#
-# get the base files for a list of modules
-#
-module-bases = $(sort $(foreach mod,$(1),$(call module-base,$(mod))))
-
-# function: modname-multi
-#
-# get the module name that a component will be linked into
-modname-multi = $(sort $(foreach mod,$(all-multi-mods), $(if $(filter $*$(1), $($(mod))),$(mod))))
-
-# set a variable called 'modname' for every file that gets built, containing
-# the module name that the file being built is associated with, or will be
-# linked into; some of these lists are built for the entire list of all
-# known modules, and others are built only for the modules that will be
-# built
-#
-# first, for single component modules (the easy ones):
-$(single-objs-c): modname = $*
-$(single-objs-cc): modname = $*
-$(patsubst %,$(astbuild_dir)/%.moduleinfo,$(all-single-mods-c)): modname = $*
-$(patsubst %,$(astbuild_dir)/%.moduleinfo,$(all-single-mods-cc)): modname = $*
-
-# second, for multi-component modules:
-$(multi-objs-c): modname = $(call modname-multi,.o)
-$(multi-objs-cc): modname = $(call modname-multi,.oo)
-$(patsubst %,$(astbuild_dir)/%.moduleinfo,$(call module-bases,$(all-multi-mods-c))): modname = $(call modname-multi,.o)
-$(patsubst %,$(astbuild_dir)/%.moduleinfo,$(call module-bases,$(all-multi-mods-cc))): modname = $(call modname-multi,.oo)
-
-$(astbuild_dir)/%.moduleinfo: %.c
-	@echo "<member name=\"$(modname)\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\">" > $@
-	@$(AWK) -f $(ASTBUILD)/get_moduleinfo $< >> $@
-	@echo "</member>" >> $@
-
-$(astbuild_dir)/%.moduleinfo: %.cc
-	@echo "<member name=\"$(modname)\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\">" > $@
-	@$(AWK) -f $(ASTBUILD)/get_moduleinfo $< >> $@
-	@echo "</member>" >> $@
-
-$(astbuild_dir)/moduleinfo: $(astbuild_dir) $(patsubst %,$(astbuild_dir)/%.moduleinfo,$(call module-bases,$(all-mods)))
-	@echo "<category name=\"MENUSELECT_$(MENUSELECT_CATEGORY)\" displayname=\"$(MENUSELECT_DESCRIPTION)\" >" > $@
-	@cat $(filter-out $(astbuild_dir),$^) >> $@
-	@echo "</category>" >> $@
-
-moduleinfo: $(astbuild_dir)/moduleinfo
-	@cat $<
-
-$(astbuild_dir)/%.makeopts: %.c
-	@$(AWK) -f $(ASTBUILD)/get_makeopts $< > $@
-
-$(astbuild_dir)/%.makeopts: %.cc
-	@$(AWK) -f $(ASTBUILD)/get_makeopts $< > $@
-
-$(astbuild_dir)/makeopts: $(astbuild_dir) $(patsubst %,$(astbuild_dir)/%.makeopts,$(call module-bases,$(all-mods)))
-	@cat $(filter-out $(astbuild_dir),$^) > $@
-
-makeopts: $(astbuild_dir)/makeopts
-	@cat $<

Copied: team/kpfleming/multimodule-build/astbuild/Makefile.menuselect (from r114015, team/kpfleming/multimodule-build/astbuild/Makefile.core)
URL: http://svn.digium.com/view/asterisk/team/kpfleming/multimodule-build/astbuild/Makefile.menuselect?view=diff&rev=114016&p1=team/kpfleming/multimodule-build/astbuild/Makefile.core&r1=114015&p2=team/kpfleming/multimodule-build/astbuild/Makefile.menuselect&r2=114016
==============================================================================
--- team/kpfleming/multimodule-build/astbuild/Makefile.core (original)
+++ team/kpfleming/multimodule-build/astbuild/Makefile.menuselect Wed Apr  9 19:09:49 2008
@@ -1,190 +1,8 @@
-# the ASTBUILD variable must be set before executing this Makefile;
-# the variable must contain the path to the 'astbuild' toolkit directory
-
-# all temporary files generated by the build system are stored
-# in a subdirectory of the working directory; set a variable
-# to hold that directory's name
-astbuild_dir = .astbuild
-
-all:: $(astbuild_dir)
-
-clean::
-	rm -f *.o *.oo
-	rm -f *.so *.a
-	rm -f built-in.o built-in.oo
-
-dist-clean:: clean
-	@rm -rf $(astbuild_dir)
-
-distclean: dist-clean
-
-$(astbuild_dir):
-	@mkdir $@
-
-# XXX: this will now be a full path
-SUBDIR:=$(shell pwd)
-
-# list of module names (all modules, using virtual names for modules that have them)
-all-mods :=
-
-# list of modules names to *not* build
-mods-n :=
-
-# list of module names to build
-mods-m :=
-mods-y :=
+include $(ASTBUILD)/Makefile.base
 
 include Makefile.astbuild
 
-# lists of module names (all modules, using virtual names for modules that have them)
-all-mods-c :=
-all-mods-cc :=
-all-multi-mods = $(all-multi-mods-c) $(all-multi-mods-cc)
-all-single-mods = $(all-single-mods-c) $(all-single-mods-cc)
-all-multi-mods-c :=
-all-multi-mods-cc :=
-all-single-mods-c :=
-all-single-mods-cc :=
-
-# lists of module names (modules to build)
-mods-c-m = $(single-mods-c-m) $(multi-mods-c-m)
-mods-c-y = $(single-mods-c-y) $(multi-mods-c-y)
-mods-cc-m = $(single-mods-cc-m) $(multi-mods-cc-m)
-mods-cc-y = $(single-mods-cc-y) $(multi-mods-cc-y)
-
-# lists of module names (multi-component modules)
-multi-mods = $(multi-mods-m) $(multi-mods-y)
-multi-mods-m = $(multi-mods-c-m) $(multi-mods-cc-m)
-multi-mods-y = $(multi-mods-c-y) $(multi-mods-cc-y)
-multi-mods-c-m :=
-multi-mods-c-y :=
-multi-mods-cc-m :=
-multi-mods-cc-y :=
-
-# lists of module names (single-component modules)
-single-mods = $(single-mods-m) $(single-mods-y)
-single-mods-m = $(single-mods-c-m) $(single-mods-cc-m)
-single-mods-y = $(single-mods-c-y) $(single-mods-cc-y)
-single-mods-c-m :=
-single-mods-c-y :=
-single-mods-cc-m :=
-single-mods-cc-y :=
-
-# lists of object names (all objects)
-objs-m = $(single-objs-m) $(multi-objs-m)
-objs-y = $(single-objs-y) $(multi-objs-y)
-objs-c-m = $(single-objs-c-m) $(multi-objs-c-m)
-objs-c-y = $(single-objs-c-y) $(multi-objs-c-y)
-objs-cc-m = $(single-objs-cc-m) $(multi-objs-cc-m)
-objs-cc-y = $(single-objs-cc-y) $(multi-objs-cc-y)
-
-# lists of object names (objects in multi-component modules)
-multi-objs = $(multi-objs-m) $(multi-objs-y)
-multi-objs-m = $(multi-objs-c-m) $(multi-objs-cc-m)
-multi-objs-y = $(multi-objs-c-y) $(multi-objs-cc-y)
-multi-objs-c = $(multi-objs-c-m) $(multi-objs-c-y)
-multi-objs-cc = $(multi-objs-cc-m) $(multi-objs-cc-y)
-multi-objs-c-m :=
-multi-objs-c-y :=
-multi-objs-cc-m :=
-multi-objs-cc-y :=
-
-# lists of object names (objects in single-component modules)
-single-objs = $(single-objs-m) $(single-objs-y)
-single-objs-m = $(single-objs-c-m) $(single-objs-cc-m)
-single-objs-y = $(single-objs-c-y) $(single-objs-cc-y)
-single-objs-c = $(single-objs-c-m) $(single-objs-c-y)
-single-objs-cc = $(single-objs-cc-m) $(single-objs-cc-y)
-single-objs-c-m :=
-single-objs-c-y :=
-single-objs-cc-m :=
-single-objs-cc-y :=
-
-# find all multi-component C modules in all-mods and move them to all-mods-c
-all-mods-c := $(strip $(foreach mod,$(all-mods),$(if $(filter %.o,$($(mod))),$(mod))))
-# find all multi-component CC modules in all-mods and move them to all-mods-cc
-all-mods-cc := $(strip $(foreach mod,$(all-mods),$(if $(filter %.oo,$($(mod))),$(mod))))
-
-# find all available C modules that aren't already known
-ifneq ($(MODULE_PREFIX),)
-  # scan for matching C sources which could be modules
-  found-mods-c := $(patsubst %.c,%,$(wildcard $(MODULE_PREFIX)_*.c))
-  # remove anything already in all-mods
-  found-mods-c := $(filter-out $(all-mods),$(found-mods-c))
-  # remove anything that is a component of any module in all-mods-c
-  found-mods-c := $(filter-out $(foreach mod,$(all-mods-c),$(patsubst %.o,%,$($(mod)))),$(found-mods-c))
-endif
-
-# find all available CC modules that aren't already known
-ifneq ($(MODULE_PREFIX),)
-  # scan for matching CC sources which could be modules
-  found-mods-cc := $(patsubst %.cc,%,$(wildcard $(MODULE_PREFIX)_*.cc))
-  # remove anything already in all-mods
-  found-mods-cc := $(filter-out $(all-mods),$(found-mods-cc))
-  # remove anything that is a component of any module in all-mods-cc
-  found-mods-cc := $(filter-out $(foreach mod,$(all-mods-cc),$(patsubst %.oo,%,$($(mod)))),$(found-mods-cc))
-endif
-
-# now rebuild the list of *all* modules to include the ones we found
-all-mods-c := $(sort $(all-mods-c) $(found-mods-c))
-all-mods-cc := $(sort $(all-mods-cc) $(found-mods-cc))
-
-all-mods := $(sort $(all-mods-c) $(all-mods-cc))
-
-# generate lists of all known modules, separated by source type and build type
-all-multi-mods-c := $(sort $(foreach mod,$(all-mods-c),$(if $($(mod)),$(mod))))
-all-multi-mods-cc := $(sort $(foreach mod,$(all-mods-cc),$(if $($(mod)),$(mod))))
-all-single-mods-c := $(filter-out $(all-multi-mods-c),$(all-mods-c))
-all-single-mods-cc := $(filter-out $(all-multi-mods-cc),$(all-mods-cc))
-
-# compute the list of modules that will be built as loadable
-#  (the subdirectory makefile will only ever specify the ones
-#   not to build at all, or to build as built-in)
-mods-m += $(filter-out $(mods-y) $(mods-n),$(all-mods))
-
-# generate the lists of multi-component modules to be built
-multi-mods-c-m := $(filter-out $(mods-y) $(mods-n),$(all-multi-mods-c))
-multi-mods-c-y := $(filter-out $(mods-m) $(mods-n),$(all-multi-mods-c))
-multi-mods-cc-m := $(filter-out $(mods-y) $(mods-n),$(all-multi-mods-cc))
-multi-mods-cc-y := $(filter-out $(mods-m) $(mods-n),$(all-multi-mods-cc))
-
-# generate the lists of single component modules to be built
-single-mods-c-m := $(filter-out $(mods-y) $(mods-n),$(all-single-mods-c))
-single-mods-c-y := $(filter-out $(mods-m) $(mods-n),$(all-single-mods-c))
-single-mods-cc-m := $(filter-out $(mods-y) $(mods-n),$(all-single-mods-cc))
-single-mods-cc-y := $(filter-out $(mods-m) $(mods-n),$(all-single-mods-cc))
-
-# generate the lists of multi-component module object files
-multi-objs-c-m := $(sort $(foreach mod,$(multi-mods-c-m),$($(mod))))
-multi-objs-c-y := $(sort $(foreach mod,$(multi-mods-c-y),$($(mod))))
-multi-objs-cc-m := $(sort $(foreach mod,$(multi-mods-cc-m),$($(mod))))
-multi-objs-cc-y := $(sort $(foreach mod,$(multi-mods-cc-y),$($(mod))))
-
-# generate the lists of single component module object files
-single-objs-c-m := $(single-mods-c-m:%=%.o)
-single-objs-c-y := $(single-mods-c-y:%=%.o)
-single-objs-cc-m := $(single-mods-cc-m:%=%.oo)
-single-objs-cc-y := $(single-mods-cc-y:%=%.oo)
-
-# function: module-base
-#
-# get the base file for a module, the one that contains its dependency
-# and other build-related information; this will be either the
-# file with the same name as the module, or the first component of its
-# component list if it is a multi-component module
-#
-module-base = $(if $($(1)),$(basename $(firstword $($(1)))),$(1))
-
-# function: module-bases
-#
-# get the base files for a list of modules
-#
-module-bases = $(sort $(foreach mod,$(1),$(call module-base,$(mod))))
-
-# function: modname-multi
-#
-# get the module name that a component will be linked into
-modname-multi = $(sort $(foreach mod,$(all-multi-mods), $(if $(filter $*$(1), $($(mod))),$(mod))))
+include $(ASTBUILD)/Makefile.modlist
 
 # set a variable called 'modname' for every file that gets built, containing
 # the module name that the file being built is associated with, or will be

Copied: team/kpfleming/multimodule-build/astbuild/Makefile.modlist (from r114015, team/kpfleming/multimodule-build/astbuild/Makefile.core)
URL: http://svn.digium.com/view/asterisk/team/kpfleming/multimodule-build/astbuild/Makefile.modlist?view=diff&rev=114016&p1=team/kpfleming/multimodule-build/astbuild/Makefile.core&r1=114015&p2=team/kpfleming/multimodule-build/astbuild/Makefile.modlist&r2=114016
==============================================================================
--- team/kpfleming/multimodule-build/astbuild/Makefile.core (original)
+++ team/kpfleming/multimodule-build/astbuild/Makefile.modlist Wed Apr  9 19:09:49 2008
@@ -1,41 +1,3 @@
-# the ASTBUILD variable must be set before executing this Makefile;
-# the variable must contain the path to the 'astbuild' toolkit directory
-
-# all temporary files generated by the build system are stored
-# in a subdirectory of the working directory; set a variable
-# to hold that directory's name
-astbuild_dir = .astbuild
-
-all:: $(astbuild_dir)
-
-clean::
-	rm -f *.o *.oo
-	rm -f *.so *.a
-	rm -f built-in.o built-in.oo
-
-dist-clean:: clean
-	@rm -rf $(astbuild_dir)
-
-distclean: dist-clean
-
-$(astbuild_dir):
-	@mkdir $@
-
-# XXX: this will now be a full path
-SUBDIR:=$(shell pwd)
-
-# list of module names (all modules, using virtual names for modules that have them)
-all-mods :=
-
-# list of modules names to *not* build
-mods-n :=
-
-# list of module names to build
-mods-m :=
-mods-y :=
-
-include Makefile.astbuild
-
 # lists of module names (all modules, using virtual names for modules that have them)
 all-mods-c :=
 all-mods-cc :=
@@ -185,51 +147,3 @@
 #
 # get the module name that a component will be linked into
 modname-multi = $(sort $(foreach mod,$(all-multi-mods), $(if $(filter $*$(1), $($(mod))),$(mod))))
-
-# set a variable called 'modname' for every file that gets built, containing
-# the module name that the file being built is associated with, or will be
-# linked into; some of these lists are built for the entire list of all
-# known modules, and others are built only for the modules that will be
-# built
-#
-# first, for single component modules (the easy ones):
-$(single-objs-c): modname = $*
-$(single-objs-cc): modname = $*
-$(patsubst %,$(astbuild_dir)/%.moduleinfo,$(all-single-mods-c)): modname = $*
-$(patsubst %,$(astbuild_dir)/%.moduleinfo,$(all-single-mods-cc)): modname = $*
-
-# second, for multi-component modules:
-$(multi-objs-c): modname = $(call modname-multi,.o)
-$(multi-objs-cc): modname = $(call modname-multi,.oo)
-$(patsubst %,$(astbuild_dir)/%.moduleinfo,$(call module-bases,$(all-multi-mods-c))): modname = $(call modname-multi,.o)
-$(patsubst %,$(astbuild_dir)/%.moduleinfo,$(call module-bases,$(all-multi-mods-cc))): modname = $(call modname-multi,.oo)
-
-$(astbuild_dir)/%.moduleinfo: %.c
-	@echo "<member name=\"$(modname)\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\">" > $@
-	@$(AWK) -f $(ASTBUILD)/get_moduleinfo $< >> $@
-	@echo "</member>" >> $@
-
-$(astbuild_dir)/%.moduleinfo: %.cc
-	@echo "<member name=\"$(modname)\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\">" > $@
-	@$(AWK) -f $(ASTBUILD)/get_moduleinfo $< >> $@
-	@echo "</member>" >> $@
-
-$(astbuild_dir)/moduleinfo: $(astbuild_dir) $(patsubst %,$(astbuild_dir)/%.moduleinfo,$(call module-bases,$(all-mods)))
-	@echo "<category name=\"MENUSELECT_$(MENUSELECT_CATEGORY)\" displayname=\"$(MENUSELECT_DESCRIPTION)\" >" > $@
-	@cat $(filter-out $(astbuild_dir),$^) >> $@
-	@echo "</category>" >> $@
-
-moduleinfo: $(astbuild_dir)/moduleinfo
-	@cat $<
-
-$(astbuild_dir)/%.makeopts: %.c
-	@$(AWK) -f $(ASTBUILD)/get_makeopts $< > $@
-
-$(astbuild_dir)/%.makeopts: %.cc
-	@$(AWK) -f $(ASTBUILD)/get_makeopts $< > $@
-
-$(astbuild_dir)/makeopts: $(astbuild_dir) $(patsubst %,$(astbuild_dir)/%.makeopts,$(call module-bases,$(all-mods)))
-	@cat $(filter-out $(astbuild_dir),$^) > $@
-
-makeopts: $(astbuild_dir)/makeopts
-	@cat $<




More information about the asterisk-commits mailing list