From 748431f7b6375e0006937e8c9fbcdaed5779ca0a Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Thu, 6 Jul 2006 21:04:28 +0000 Subject: move rules file to prepare for generic rules file git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37222 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- Makefile | 8 ++++---- Makefile.moddir_rules | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile.rules | 53 --------------------------------------------------- apps/Makefile | 2 +- cdr/Makefile | 2 +- channels/Makefile | 12 ++++++------ codecs/Makefile | 2 +- formats/Makefile | 2 +- funcs/Makefile | 2 +- pbx/Makefile | 2 +- res/Makefile | 2 +- 11 files changed, 70 insertions(+), 70 deletions(-) create mode 100644 Makefile.moddir_rules delete mode 100644 Makefile.rules diff --git a/Makefile b/Makefile index c0d1fcb9a..71819551d 100644 --- a/Makefile +++ b/Makefile @@ -25,14 +25,14 @@ OPTIONS= #SUB_PROC=xscale # or maverick ifeq ($(CROSS_COMPILE),) - OSARCH=$(shell uname -s) - PROC?=$(shell uname -m) + OSARCH:=$(shell uname -s) + PROC?:=$(shell uname -m) else OSARCH=$(CROSS_ARCH) PROC=$(CROSS_PROC) endif -PWD=$(shell pwd) +ASTTOPDIR:=$(shell pwd) # Remember the MAKELEVEL at the top MAKETOPLEVEL?=$(MAKELEVEL) @@ -886,7 +886,7 @@ menuselect: menuselect/menuselect makeopts.xml -@menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!" menuselect/menuselect: menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect.h menuselect/linkedlists.h config.status mxml/libmxml.a - @CFLAGS="-include $(PWD)/include/asterisk/autoconfig.h -I$(PWD)/include" PARENTSRC="$(PWD)" $(MAKE) -C menuselect menuselect + @CFLAGS="-include $(ASTTOPDIR)/include/asterisk/autoconfig.h -I$(ASTTOPDIR)/include" PARENTSRC="$(ASTTOPDIR)" $(MAKE) -C menuselect menuselect mxml/libmxml.a: @cd mxml && unset CFLAGS LIBS && test -f config.h || ./configure diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules new file mode 100644 index 000000000..a82fc99be --- /dev/null +++ b/Makefile.moddir_rules @@ -0,0 +1,53 @@ +# +# Asterisk -- A telephony toolkit for Linux. +# +# Makefile rules +# +# Copyright (C) 2006, Digium, Inc. +# +# Kevin P. Fleming +# +# This program is free software, distributed under the terms of +# the GNU General Public License +# + +define module_o_template +$(1).o: $(1).c + $$(CC) -c -o $$@ $$< $$(CFLAGS) $$(MENUSELECT_OPTS_$(1):%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_INCLUDE)) +endef + +define module_so_template +$(1).so: $(1).o + $$(CC) $$(SOLINK) -o $$@ $$^ $(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_LIB)) +endef + +%.o: %.c + $(CC) -c -o $@ $< $(CFLAGS) + +$(foreach mod,$(SELECTED_MODS),$(eval $(call module_o_template,$(mod)))) + +$(foreach mod,$(SELECTED_MODS),$(eval $(call module_so_template,$(mod)))) + +.PHONY: clean clean-depend depend uninstall _all + +_all: $(SELECTED_MODS:%=%.so) + +clean-depend:: + rm -f .depend + +clean:: clean-depend + rm -f *.so *.o + +install:: all + for x in $(SELECTED_MODS:%=%.so); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done + +uninstall:: + +ifneq ($(wildcard .depend),) + include .depend +endif + +depend: .depend + +.depend: + ../build_tools/mkdep $(CFLAGS) `ls *.c` diff --git a/Makefile.rules b/Makefile.rules deleted file mode 100644 index a82fc99be..000000000 --- a/Makefile.rules +++ /dev/null @@ -1,53 +0,0 @@ -# -# Asterisk -- A telephony toolkit for Linux. -# -# Makefile rules -# -# Copyright (C) 2006, Digium, Inc. -# -# Kevin P. Fleming -# -# This program is free software, distributed under the terms of -# the GNU General Public License -# - -define module_o_template -$(1).o: $(1).c - $$(CC) -c -o $$@ $$< $$(CFLAGS) $$(MENUSELECT_OPTS_$(1):%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_INCLUDE)) -endef - -define module_so_template -$(1).so: $(1).o - $$(CC) $$(SOLINK) -o $$@ $$^ $(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_LIB)) -endef - -%.o: %.c - $(CC) -c -o $@ $< $(CFLAGS) - -$(foreach mod,$(SELECTED_MODS),$(eval $(call module_o_template,$(mod)))) - -$(foreach mod,$(SELECTED_MODS),$(eval $(call module_so_template,$(mod)))) - -.PHONY: clean clean-depend depend uninstall _all - -_all: $(SELECTED_MODS:%=%.so) - -clean-depend:: - rm -f .depend - -clean:: clean-depend - rm -f *.so *.o - -install:: all - for x in $(SELECTED_MODS:%=%.so); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done - -uninstall:: - -ifneq ($(wildcard .depend),) - include .depend -endif - -depend: .depend - -.depend: - ../build_tools/mkdep $(CFLAGS) `ls *.c` diff --git a/apps/Makefile b/apps/Makefile index 7c86dfa32..c772be786 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -20,7 +20,7 @@ MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_ODBC_STORAGE) $(MENUSELEC all: _all -include ../Makefile.rules +include $(ASTTOPDIR)/Makefile.moddir_rules ifeq (SunOS,$(shell uname)) app_chanspy.so: app_chanspy.o diff --git a/cdr/Makefile b/cdr/Makefile index e713d94bf..ef877e879 100644 --- a/cdr/Makefile +++ b/cdr/Makefile @@ -18,4 +18,4 @@ SELECTED_MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.c,%,$(wildcard cdr_*. all: _all -include ../Makefile.rules +include $(ASTTOPDIR)/Makefile.moddir_rules diff --git a/channels/Makefile b/channels/Makefile index 866af68fc..d24b3ea13 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -60,17 +60,17 @@ MENUSELECT_OPTS_chan_misdn+=CHAN_MISDN_VERSION=\"0.3.0\" all: _all -include ../Makefile.rules +include $(ASTTOPDIR)/Makefile.moddir_rules clean:: rm -f busy.h ringtone.h gentone gentone-ulaw -ifneq ($(wildcard h323/Makefile.ast),) - include h323/Makefile.ast +ifneq ($(wildcard $(ASTTOPDIR)/Makefile.ast),) + include $(ASTTOPDIR)/Makefile.ast endif -ifneq ($(wildcard misdn/Makefile.ast),) - include misdn/Makefile.ast +ifneq ($(wildcard m$(ASTTOPDIR)/Makefile.ast),) + include m$(ASTTOPDIR)/Makefile.ast endif gentone gentone-ulaw: %: %.c @@ -95,7 +95,7 @@ chan_vpb.so: chan_vpb.o $(CXX) $(SOLINK) -o $@ $< -lvpb -lpthread -lm -ldl ifeq ($(OSARCH),Linux) -chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast +chan_h323.so: chan_h323.o h323/libchanh323.a $(ASTTOPDIR)/Makefile.ast $(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) -lstdc++ else chan_h323.so: chan_h323.o h323/libchanh323.a diff --git a/codecs/Makefile b/codecs/Makefile index f98637aa1..37aef4345 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -30,7 +30,7 @@ GSM_LIB:= codec_gsm.so: gsm/lib/libgsm.a endif -include ../Makefile.rules +include $(ASTTOPDIR)/Makefile.moddir_rules clean:: $(MAKE) -C gsm clean diff --git a/formats/Makefile b/formats/Makefile index 06195d03c..582390054 100644 --- a/formats/Makefile +++ b/formats/Makefile @@ -18,4 +18,4 @@ SELECTED_MODS:=$(filter-out $(MENUSELECT_FORMATS),$(patsubst %.c,%,$(wildcard fo all: _all -include ../Makefile.rules +include $(ASTTOPDIR)/Makefile.moddir_rules diff --git a/funcs/Makefile b/funcs/Makefile index 5a8845c18..97b8e38cf 100644 --- a/funcs/Makefile +++ b/funcs/Makefile @@ -29,4 +29,4 @@ endif all: _all -include ../Makefile.rules +include $(ASTTOPDIR)/Makefile.moddir_rules diff --git a/pbx/Makefile b/pbx/Makefile index 7680943cb..43aa519b7 100644 --- a/pbx/Makefile +++ b/pbx/Makefile @@ -20,7 +20,7 @@ MODS:=$(patsubst %,%.so,$(SELECTED_MODS)) all: _all -include ../Makefile.rules +include $(ASTTOPDIR)/Makefile.moddir_rules clean:: rm -f ael/*.o diff --git a/res/Makefile b/res/Makefile index 6ce2ae08f..22f266abb 100644 --- a/res/Makefile +++ b/res/Makefile @@ -22,7 +22,7 @@ endif all: _all -include ../Makefile.rules +include $(ASTTOPDIR)/Makefile.moddir_rules res_snmp.so: res_snmp.o snmp/agent.o -- cgit v1.2.3