diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2007-01-03 03:28:12 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2007-01-03 03:28:12 +0000 |
| commit | 2d1e6ff221785e56a56939e14793ae858e7e5106 (patch) | |
| tree | 50576732e1e57fa2409ef5a07c4cac16d185865f | |
| parent | 1825b70a4cec501d2bbe140c1a292ea576902fc6 (diff) | |
Merged revisions 49282 via svnmerge from
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
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | Makefile.rules | 10 |
2 files changed, 11 insertions, 3 deletions
@@ -312,10 +312,10 @@ $(SUBDIRS): include/asterisk/version.h include/asterisk/build.h include/asterisk main: $(filter-out main,$(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): - @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 @build_tools/make_defaults_h > $@.tmp diff --git a/Makefile.rules b/Makefile.rules index 591322ef2..b7560a87c 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -44,6 +44,14 @@ else $(CMD_PREFIX) $(CC) -o $@ -c $< $(ASTCFLAGS) 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 $(ECHO_PREFIX) echo " [CXX] $< -> $@" ifeq ($(AST_DEVMODE),yes) @@ -64,7 +72,7 @@ endif $(ECHO_PREFIX) echo " [LD] $^ -> $@" $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLDFLAGS) $(SOLINK) $^ $(LIBS) -%.soo: %.oo +%.so: %.oo $(ECHO_PREFIX) echo " [LDXX] $^ -> $@" $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLDFLAGS) $(SOLINK) $^ $(LIBS) |