diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-06 21:04:28 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-06 21:04:28 +0000 |
commit | 84cc5e8bd05435b7e181b4685f1d13cb74c81d7e (patch) | |
tree | 1c5c6cf99224906d0c4f8267a08a7922461ac144 | |
parent | 520519c03f7c7ed69a83148b5ef9ea7af9480841 (diff) |
move rules file to prepare for generic rules file
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@37222 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | Makefile | 8 | ||||
-rw-r--r-- | Makefile.moddir_rules (renamed from Makefile.rules) | 0 | ||||
-rw-r--r-- | apps/Makefile | 2 | ||||
-rw-r--r-- | cdr/Makefile | 2 | ||||
-rw-r--r-- | channels/Makefile | 12 | ||||
-rw-r--r-- | codecs/Makefile | 2 | ||||
-rw-r--r-- | formats/Makefile | 2 | ||||
-rw-r--r-- | funcs/Makefile | 2 | ||||
-rw-r--r-- | pbx/Makefile | 2 | ||||
-rw-r--r-- | res/Makefile | 2 |
10 files changed, 17 insertions, 17 deletions
@@ -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 index a82fc99be..a82fc99be 100644 --- a/Makefile.rules +++ b/Makefile.moddir_rules 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 |