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

diff --git a/Makefile b/Makefile
index c0d1fcb9acb3cbcd5ed19cdb862ebe488de13956..71819551df5407684838d3ec320845c0b9e5a2d1 100644 (file)
--- 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.rules b/Makefile.moddir_rules
similarity index 100%
rename from Makefile.rules
rename to Makefile.moddir_rules

diff --git a/apps/Makefile b/apps/Makefile
index 7c86dfa32febf15e6890b9a11b3de9c61aada323..c772be786a3ff9bb9bea1757fd2fc2cbc6c00847 100644 (file)
--- 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 e713d94bfce45db9a15ffbd5468ea7cc9c7e29f1..ef877e8795325767258864587c77dcc161296f85 100644 (file)
--- 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 866af68fc5565b02b1d1e3953ee022f2e96f329e..d24b3ea13038c5225481c84ab093e48aba3bbbd0 100644 (file)
--- 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 f98637aa11577e0694f49fd3f5c43f5da44db005..37aef4345594b32f6fa8e43eb7394604d3ee1d06 100644 (file)
--- 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 06195d03c0df18b05d79f9ed5dd7f28bedea4e4f..582390054df0f85d696fa2404f5b89ea82b87587 100644 (file)
--- 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 5a8845c1843c80c575ee547dc2056e2804ab8135..97b8e38cfae4892578989c07707109cf86e9169f 100644 (file)
--- 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 7680943cb038407961f555b111ff3afb16feb05f..43aa519b7ada370b58679c21bb70dce285c21947 100644 (file)
--- 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 6ce2ae08fc3f80965720d410c2639885d2cb67e4..22f266abbb00d9fe9da88ca455f5aef238226d01 100644 (file)
--- 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