diff options
| author | Russell Bryant <russell@russellbryant.com> | 2006-06-22 12:33:50 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2006-06-22 12:33:50 +0000 |
| commit | ad721dc2c1684fa44c6e5a9ae47ab8248bd47c80 (patch) | |
| tree | 3c097d687629c3869ef1f6e80a2b16d659e40b45 | |
| parent | be0d611984e487bbbad9386a9d287139a7be2069 (diff) | |
instead of using a for loop to call 'make install' on each subdirectory, use
separate targets
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35437 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -272,6 +272,7 @@ ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS) MOD_SUBDIRS=res channels pbx apps codecs formats cdr funcs OTHER_SUBDIRS=utils agi SUBDIRS:=$(MOD_SUBDIRS) $(OTHER_SUBDIRS) +SUBDIRS_INSTALL:=$(patsubst %,%-install,$(SUBDIRS)) OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \ translate.o file.o pbx.o cli.o md5.o term.o \ @@ -587,8 +588,8 @@ bininstall: all $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ -install-subdirs: - @for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done +$(SUBDIRS_INSTALL): + @$(MAKE) -C $(@:-install=) install NEWMODS=$(notdir $(wildcard */*.so)) OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so))) @@ -611,7 +612,7 @@ oldmodcheck: echo " WARNING WARNING WARNING" ;\ fi -install: all datafiles bininstall install-subdirs +install: all datafiles bininstall $(SUBDIRS_INSTALL) @if [ -x /usr/sbin/asterisk-post-install ]; then \ /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ fi |