[svn-commits] trunk r37222 - in /trunk: ./ apps/ cdr/ channels/ codecs/ formats/ funcs/ pbx...

svn-commits at lists.digium.com svn-commits at lists.digium.com
Thu Jul 6 14:04:29 MST 2006


Author: kpfleming
Date: Thu Jul  6 16:04:28 2006
New Revision: 37222

URL: http://svn.digium.com/view/asterisk?rev=37222&view=rev
Log:
move rules file to prepare for generic rules file

Added:
    trunk/Makefile.moddir_rules
      - copied unchanged from r37212, trunk/Makefile.rules
Removed:
    trunk/Makefile.rules
Modified:
    trunk/Makefile
    trunk/apps/Makefile
    trunk/cdr/Makefile
    trunk/channels/Makefile
    trunk/codecs/Makefile
    trunk/formats/Makefile
    trunk/funcs/Makefile
    trunk/pbx/Makefile
    trunk/res/Makefile

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=37222&r1=37221&r2=37222&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Jul  6 16:04:28 2006
@@ -25,14 +25,14 @@
 #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 @@
 	- at 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

Modified: trunk/apps/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/apps/Makefile?rev=37222&r1=37221&r2=37222&view=diff
==============================================================================
--- trunk/apps/Makefile (original)
+++ trunk/apps/Makefile Thu Jul  6 16:04:28 2006
@@ -20,7 +20,7 @@
 
 all: _all
 
-include ../Makefile.rules
+include $(ASTTOPDIR)/Makefile.moddir_rules
 
 ifeq (SunOS,$(shell uname))
 app_chanspy.so: app_chanspy.o

Modified: trunk/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/cdr/Makefile?rev=37222&r1=37221&r2=37222&view=diff
==============================================================================
--- trunk/cdr/Makefile (original)
+++ trunk/cdr/Makefile Thu Jul  6 16:04:28 2006
@@ -18,4 +18,4 @@
 
 all: _all
 
-include ../Makefile.rules
+include $(ASTTOPDIR)/Makefile.moddir_rules

Modified: trunk/channels/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/channels/Makefile?rev=37222&r1=37221&r2=37222&view=diff
==============================================================================
--- trunk/channels/Makefile (original)
+++ trunk/channels/Makefile Thu Jul  6 16:04:28 2006
@@ -60,17 +60,17 @@
 
 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 @@
 	 $(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

Modified: trunk/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/codecs/Makefile?rev=37222&r1=37221&r2=37222&view=diff
==============================================================================
--- trunk/codecs/Makefile (original)
+++ trunk/codecs/Makefile Thu Jul  6 16:04:28 2006
@@ -30,7 +30,7 @@
 codec_gsm.so: gsm/lib/libgsm.a
 endif
 
-include ../Makefile.rules
+include $(ASTTOPDIR)/Makefile.moddir_rules
 
 clean::
 	$(MAKE) -C gsm clean

Modified: trunk/formats/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/formats/Makefile?rev=37222&r1=37221&r2=37222&view=diff
==============================================================================
--- trunk/formats/Makefile (original)
+++ trunk/formats/Makefile Thu Jul  6 16:04:28 2006
@@ -18,4 +18,4 @@
 
 all: _all
 
-include ../Makefile.rules
+include $(ASTTOPDIR)/Makefile.moddir_rules

Modified: trunk/funcs/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/funcs/Makefile?rev=37222&r1=37221&r2=37222&view=diff
==============================================================================
--- trunk/funcs/Makefile (original)
+++ trunk/funcs/Makefile Thu Jul  6 16:04:28 2006
@@ -29,4 +29,4 @@
 
 all: _all
 
-include ../Makefile.rules
+include $(ASTTOPDIR)/Makefile.moddir_rules

Modified: trunk/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/pbx/Makefile?rev=37222&r1=37221&r2=37222&view=diff
==============================================================================
--- trunk/pbx/Makefile (original)
+++ trunk/pbx/Makefile Thu Jul  6 16:04:28 2006
@@ -20,7 +20,7 @@
 
 all: _all
 
-include ../Makefile.rules
+include $(ASTTOPDIR)/Makefile.moddir_rules
 
 clean::
 	rm -f ael/*.o

Modified: trunk/res/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/res/Makefile?rev=37222&r1=37221&r2=37222&view=diff
==============================================================================
--- trunk/res/Makefile (original)
+++ trunk/res/Makefile Thu Jul  6 16:04:28 2006
@@ -22,7 +22,7 @@
 
 all: _all
 
-include ../Makefile.rules
+include $(ASTTOPDIR)/Makefile.moddir_rules
 
 res_snmp.so: res_snmp.o snmp/agent.o
 



More information about the svn-commits mailing list