kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 49282 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r49282 | kpfleming | 2007-01-02 21:21:25 -0600 (Tue, 02 Jan 2007) | 2 lines

various Makefile improvements to get chan_vpb (and any other C++ modules) to build properly

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49283 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2007-01-03 03:28:12 +00:00
parent 1825b70a4c
commit 2d1e6ff221
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -312,10 +312,10 @@ $(SUBDIRS): include/asterisk/version.h include/asterisk/build.h include/asterisk
main: $(filter-out main,$(MOD_SUBDIRS)) main: $(filter-out main,$(MOD_SUBDIRS))
$(MOD_SUBDIRS): $(MOD_SUBDIRS):
@ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AST_LIBS="$(AST_LIBS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AST_LIBS="$(AST_LIBS)" $(MAKE) --no-print-directory --no-builtin-rules -C $@ SUBDIR=$@ all
$(OTHER_SUBDIRS): $(OTHER_SUBDIRS):
@ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AUDIO_LIBS="$(AUDIO_LIBS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AUDIO_LIBS="$(AUDIO_LIBS)" $(MAKE) --no-print-directory --no-builtin-rules -C $@ SUBDIR=$@ all
defaults.h: makeopts defaults.h: makeopts
@build_tools/make_defaults_h > $@.tmp @build_tools/make_defaults_h > $@.tmp

10
Makefile.rules
View File

@@ -44,6 +44,14 @@ else
$(CMD_PREFIX) $(CC) -o $@ -c $< $(ASTCFLAGS) $(CMD_PREFIX) $(CC) -o $@ -c $< $(ASTCFLAGS)
endif endif
%.o: %.s
$(ECHO_PREFIX) echo " [AS] $< -> $@"
ifeq ($(AST_DEVMODE),yes)
$(CMD_PREFIX) $(CC) -o $@ -c $< $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
else
$(CMD_PREFIX) $(CC) -o $@ -c $< $(ASTCFLAGS)
endif
%.oo: %.cc %.oo: %.cc
$(ECHO_PREFIX) echo " [CXX] $< -> $@" $(ECHO_PREFIX) echo " [CXX] $< -> $@"
ifeq ($(AST_DEVMODE),yes) ifeq ($(AST_DEVMODE),yes)
@@ -64,7 +72,7 @@ endif
$(ECHO_PREFIX) echo " [LD] $^ -> $@" $(ECHO_PREFIX) echo " [LD] $^ -> $@"
$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLDFLAGS) $(SOLINK) $^ $(LIBS) $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLDFLAGS) $(SOLINK) $^ $(LIBS)
%.soo: %.oo %.so: %.oo
$(ECHO_PREFIX) echo " [LDXX] $^ -> $@" $(ECHO_PREFIX) echo " [LDXX] $^ -> $@"
$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLDFLAGS) $(SOLINK) $^ $(LIBS) $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLDFLAGS) $(SOLINK) $^ $(LIBS)