[asterisk-commits] branch russell/make_output - r8083 in
/team/russell/make_output: ./ agi/ apps...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Sun Jan 15 18:07:06 MST 2006
Author: russell
Date: Sun Jan 15 19:06:57 2006
New Revision: 8083
URL: http://svn.digium.com/view/asterisk?rev=8083&view=rev
Log:
merge changes
Modified:
team/russell/make_output/.cleancount
team/russell/make_output/Makefile
team/russell/make_output/agi/Makefile
team/russell/make_output/apps/Makefile
team/russell/make_output/cdr/Makefile
team/russell/make_output/channels/Makefile
team/russell/make_output/channels/misdn/Makefile
team/russell/make_output/codecs/Makefile
team/russell/make_output/codecs/gsm/Makefile
team/russell/make_output/codecs/ilbc/Makefile
team/russell/make_output/codecs/lpc10/Makefile
team/russell/make_output/cygwin/Makefile
team/russell/make_output/db1-ast/Makefile
team/russell/make_output/editline/Makefile.in
team/russell/make_output/formats/Makefile
team/russell/make_output/funcs/Makefile
team/russell/make_output/pbx/Makefile
team/russell/make_output/res/Makefile
team/russell/make_output/stdtime/Makefile
team/russell/make_output/utils/Makefile
Modified: team/russell/make_output/.cleancount
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/.cleancount?rev=8083&r1=8082&r2=8083&view=diff
==============================================================================
--- team/russell/make_output/.cleancount (original)
+++ team/russell/make_output/.cleancount Sun Jan 15 19:06:57 2006
@@ -1,1 +1,0 @@
-8
Modified: team/russell/make_output/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/Makefile?rev=8083&r1=8082&r2=8083&view=diff
==============================================================================
--- team/russell/make_output/Makefile (original)
+++ team/russell/make_output/Makefile Sun Jan 15 19:06:57 2006
@@ -15,6 +15,12 @@
# Create OPTIONS variable
OPTIONS=
+
+# Set this to empty to disabling suppressing commands executred by the Makefile
+ifndef MAKEDEBUG
+CMDPREFIX=@
+endif
+
# If cross compiling, define these to suit
# CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
# CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
@@ -51,6 +57,7 @@
CFLAGS+=-DSTACK_BACKTRACES
endif
endif
+
#Overwite config files on "make samples"
OVERWRITE=y
@@ -341,7 +348,7 @@
ASTCFLAGS+= -fomit-frame-pointer
endif
-SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime
+SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils
OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
translate.o file.o say.o pbx.o cli.o md5.o term.o \
@@ -440,15 +447,14 @@
noclean: depend asterisk subdirs
-editline/config.h:
- cd editline && unset CFLAGS LIBS && ./configure ; \
-
editline/libedit.a: FORCE
- cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
- $(MAKE) -C editline libedit.a
+ @echo "-=-=- Building libedit -=-=-"
+ $(CMDPREFIX)cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
+ $(CMDPREFIX)$(MAKE) -C editline libedit.a
db1-ast/libdb1.a: FORCE
- @if [ -d db1-ast ]; then \
+ $(CMDPREFIX)if [ -d db1-ast ]; then \
+ echo "-=-=- Building libdb1 -=-=-" ; \
$(MAKE) -C db1-ast libdb1.a ; \
else \
echo "You need to do a cvs update -d not just cvs update"; \
@@ -496,21 +502,20 @@
docbook2txt asterisk.sgml
defaults.h: FORCE
- build_tools/make_defaults_h > $@.tmp
- if cmp -s $@.tmp $@ ; then echo ; else \
+ $(CMDPREFIX)build_tools/make_defaults_h > $@.tmp
+ $(CMDPREFIX)if cmp -s $@.tmp $@ ; then : ; else \
mv $@.tmp $@ ; \
fi
- rm -f $@.tmp
+ $(CMDPREFIX)rm -f $@.tmp
include/asterisk/version.h: FORCE
- build_tools/make_version_h > $@.tmp
- if cmp -s $@.tmp $@ ; then echo; else \
- mv $@.tmp $@ ; \
- fi
- rm -f $@.tmp
+ $(CMDPREFIX)build_tools/make_version_h > $@.tmp
+ $(CMDPREFIX)if cmp -s $@.tmp $@ ; then : ; else mv $@.tmp $@ ; fi
+ $(CMDPREFIX)rm -f $@.tmp
stdtime/libtime.a: FORCE
- @if [ -d stdtime ]; then \
+ $(CMDPREFIX)if [ -d stdtime ]; then \
+ echo "-=-=- Building libtime -=-=-" ; \
$(MAKE) -C stdtime libtime.a ; \
else \
echo "You need to do a cvs update -d not just cvs update"; \
@@ -521,37 +526,46 @@
$(MAKE) -C cygwin all
asterisk: $(CYGLOADER) editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
- build_tools/make_build_h > include/asterisk/build.h.tmp
- if cmp -s include/asterisk/build.h.tmp include/asterisk/build.h ; then echo ; else \
+ $(CMDPREFIX)build_tools/make_build_h > include/asterisk/build.h.tmp
+ $(CMDPREFIX)if cmp -s include/asterisk/build.h.tmp include/asterisk/build.h ; then echo ; else \
mv include/asterisk/build.h.tmp include/asterisk/build.h ; \
fi
- rm -f include/asterisk/build.h.tmp
- $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
- $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
+ $(CMDPREFIX)rm -f include/asterisk/build.h.tmp
+ $(CMDPREFIX)$(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
+ @echo "-=-=- Linking Asterisk Executable -=-=-"
+ $(CMDPREFIX)$(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
muted: muted.o
$(CC) $(AUDIO_LIBS) -o muted muted.o
-subdirs:
- for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done
+subdirs:
+ $(CMDPREFIX)for x in $(SUBDIRS); do echo "-=-=- Building $$x -=-=-" ; $(MAKE) -C $$x || exit 1 ; done
clean:
- for x in $(SUBDIRS); do $(MAKE) -C $$x clean || exit 1 ; done
- rm -f *.o *.so asterisk .depend
- rm -f defaults.h
- rm -f include/asterisk/build.h
- rm -f include/asterisk/version.h
- rm -f .tags-depend .tags-sources tags TAGS
- @if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi
- @if [ -d mpg123-0.59r ]; then $(MAKE) -C mpg123-0.59r clean; fi
- $(MAKE) -C db1-ast clean
- $(MAKE) -C stdtime clean
+ @for x in $(SUBDIRS) stdtime; do \
+ echo "-=-=- Cleaning sub-directory $$x -=-=-" ; \
+ $(MAKE) -C $$x clean || exit 1 ; \
+ done
+ @echo "-=-=- Cleaning out base directory -=-=-"
+ $(CMDPREFIX)rm -f *.o *.so asterisk .depend
+ $(CMDPREFIX)rm -f defaults.h
+ $(CMDPREFIX)rm -f include/asterisk/build.h
+ $(CMDPREFIX)rm -f include/asterisk/version.h
+ $(CMDPREFIX)rm -f .tags-depend .tags-sources tags TAGS
+ $(CMDPREFIX)if [ -f editline/Makefile ]; then echo "-=-=- Cleaning editline -=-=-" && $(MAKE) -C editline distclean ; fi
+ $(CMDPREFIX)if [ -d mpg123-0.59r ]; then echo "-=-=- Cleaning mpg123 -=-=-" && $(MAKE) -C mpg123-0.59r clean; fi
+ @echo "-=-=- Cleaning db1 -=-=-"
+ $(CMDPREFIX)$(MAKE) -C db1-ast clean
+ @echo "-=-=- Cleaning stdtime -=-=-"
+ $(CMDPREFIX)$(MAKE) -C stdtime clean
datafiles: all
- if [ x`whoami` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
- for x in sounds/digits/*.gsm; do \
+ @echo "-=-=- Running mkpkgconfig -=-=-"
+ $(CMDPREFIX)if [ x`whoami` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+ @echo "-=-=- Installing base Asterisk sounds -=-=-"
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
+ $(CMDPREFIX)for x in sounds/digits/*.gsm; do \
if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
else \
@@ -559,8 +573,8 @@
exit 1; \
fi; \
done
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate
- for x in sounds/dictate/*.gsm; do \
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate
+ $(CMDPREFIX)for x in sounds/dictate/*.gsm; do \
if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \
else \
@@ -568,8 +582,8 @@
exit 1; \
fi; \
done
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
- for x in sounds/letters/*.gsm; do \
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
+ $(CMDPREFIX)for x in sounds/letters/*.gsm; do \
if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
else \
@@ -577,8 +591,8 @@
exit 1; \
fi; \
done
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
- for x in sounds/phonetic/*.gsm; do \
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
+ $(CMDPREFIX)for x in sounds/phonetic/*.gsm; do \
if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
else \
@@ -586,7 +600,7 @@
exit 1; \
fi; \
done
- for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-*; do \
+ $(CMDPREFIX)for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-*; do \
if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
else \
@@ -594,16 +608,19 @@
exit 1; \
fi; \
done
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/images
- for x in images/*.jpg; do \
+ @echo "-=-=- Creating MusicOnHold directory: $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 -=-=-"
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
+ @echo "-=-=- Installing included images to $(DESTDIR)$(ASTVARLIBDIR)/images ..."
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/images
+ $(CMDPREFIX)for x in images/*.jpg; do \
$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \
done
- mkdir -p $(DESTDIR)$(AGI_DIR)
+ @echo "-=-=- Creating agi-bin directory: $(DESTDIR)$(AGI_DIR) ..."
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(AGI_DIR)
update:
- @if [ -d .svn ]; then \
- echo "Updating from Subversion..." ; \
+ $(CMDPREFIX)if [ -d .svn ]; then \
+ echo "-=-=- Updating from Subversion -=-=-" ; \
svn update | tee update.out; \
rm -f .version; \
if [ `grep -c ^C update.out` -gt 0 ]; then \
@@ -612,7 +629,12 @@
fi ; \
rm -f update.out; \
elif [ -d CVS ]; then \
- echo "Updating from CVS..." ; \
+ echo "-=-=- Updating from CVS -=-=-" ; \
+ echo "WARNING: The Asterisk project now uses subversion for source code" ; \
+ echo "management. CVS is no longer guaranteed to be up to date. Please" ; \
+ echo "switch to using svn as soon as possible. See the download page for" ; \
+ echo "more information: http://www.asterisk.org/download/" ; \
+ sleep 5 ; \
cvs -q -z3 update -Pd | tee update.out; \
rm -f .version; \
if [ `grep -c ^C update.out` -gt 0 ]; then \
@@ -628,54 +650,59 @@
OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
bininstall: all
- mkdir -p $(DESTDIR)$(MODULES_DIR)
- mkdir -p $(DESTDIR)$(ASTSBINDIR)
- mkdir -p $(DESTDIR)$(ASTETCDIR)
- mkdir -p $(DESTDIR)$(ASTBINDIR)
- mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate
- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system
- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
- if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi
- if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi
- if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi
- ln -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
- if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(MODULES_DIR)
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTSBINDIR)
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTETCDIR)
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTBINDIR)
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
+ @echo "-=-=- Installing Asterisk binaries to $(DESTDIR)$(ASTBINDIR) -=-=-"
+ $(CMDPREFIX)if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi
+ $(CMDPREFIX)if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi
+ $(CMDPREFIX)if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi
+ $(CMDPREFIX)ln -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
+ $(CMDPREFIX)$(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
+ $(CMDPREFIX)$(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
+ $(CMDPREFIX)if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
fi
- for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
- if [ -n "$(OLDHEADERS)" ]; then \
+ $(CMDPREFIX)for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
+ @echo "-=-=- Installing Asterisk Development Header Files to $(DESTDIR)$(ASTHEADERDIR) -=-=-"
+ $(CMDPREFIX)$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
+ $(CMDPREFIX)$(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
+ $(CMDPREFIX)if [ -n "$(OLDHEADERS)" ]; then \
rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
fi
rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
- $(INSTALL) -m 644 asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
- if [ -d contrib/firmware/iax ]; then \
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
+ @echo "-=-=- Installing included public keys to: $(DESTDIR)$(ASTVARLIBDIR)/keys -=-=-"
+ $(CMDPREFIX)$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
+ $(CMDPREFIX)$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
+ @echo "-=-=- Installing included man pages to: $(DESTDIR)$(ASTMANDIR)/man8 -=-=-"
+ $(CMDPREFIX)$(INSTALL) -m 644 asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+ $(CMDPREFIX)$(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
+ $(CMDPREFIX)$(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
+ $(CMDPREFIX)$(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+ @echo "-=-=- Installing included IAX firmware images to: $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax -=-=-"
+ $(CMDPREFIX)if [ -d contrib/firmware/iax ]; then \
$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
else \
echo "You need to do cvs update -d not just cvs update" ; \
fi
- ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -s $(ASTSPOOLDIR)/voicemail . )
- if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi
+ $(CMDPREFIX)( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -s $(ASTSPOOLDIR)/voicemail . )
+ $(CMDPREFIX)if [ -f mpg123-0.59r/mpg123 ]; then echo "-=-=- Installing mpg123 -=-=-" ; $(MAKE) -C mpg123-0.59r install; fi
@echo " +---- Asterisk Installation Complete -------+"
@echo " + +"
@echo " + YOU MUST READ THE SECURITY DOCUMENT +"
@@ -697,13 +724,13 @@
@echo " + **Note** This requires that you have +"
@echo " + doxygen installed on your local system +"
@echo " +-------------------------------------------+"
- @$(MAKE) -s oldmodcheck
+ $(CMDPREFIX)$(MAKE) -s oldmodcheck
NEWMODS=$(notdir $(wildcard */*.so))
OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
oldmodcheck:
- @if [ -n "$(OLDMODS)" ]; then \
+ $(CMDPREFIX)if [ -n "$(OLDMODS)" ]; then \
echo " WARNING WARNING WARNING" ;\
echo "" ;\
echo " Your Asterisk modules directory, located at" ;\
@@ -721,23 +748,26 @@
fi
install: all datafiles bininstall
- @if [ -x /usr/sbin/asterisk-post-install ]; then \
+ $(CMDPREFIX)if [ -x /usr/sbin/asterisk-post-install ]; then \
+ echo "-=-=- Executing post-install: /usr/sbin/asterisk-post-install $(DESTDIR) . -=-=-" ; \
/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
fi
upgrade: all bininstall
adsi:
- mkdir -p $(DESTDIR)$(ASTETCDIR)
- for x in configs/*.adsi; do \
+ @echo "-=-=- Installing adsi files to $(DESTDIR)$(ASTETCDIR)/configs -=-=-"
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTETCDIR)
+ $(CMDPREFIX)for x in configs/*.adsi; do \
if [ ! -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \
$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \
fi ; \
done
samples: adsi
- mkdir -p $(DESTDIR)$(ASTETCDIR)
- for x in configs/*.sample; do \
+ @echo "-=-=- Installing sample configuration to $(DESTDIR)$(ASTETCDIR) -=-=-"
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTETCDIR)
+ $(CMDPREFIX)for x in configs/*.sample; do \
if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
if [ "$(OVERWRITE)" = "y" ]; then \
if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; then \
@@ -752,7 +782,9 @@
fi ; \
$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
done
- if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
+
+ @if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
+ echo "-=-=- Generating asterisk.conf -=-=-" ; \
( \
echo "[directories]" ; \
echo "astetcdir => $(ASTETCDIR)" ; \
@@ -773,8 +805,9 @@
else \
echo "Skipping asterisk.conf creation"; \
fi
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
- for x in sounds/demo-*; do \
+ @echo "-=-=- Installing demo sounds to $(DESTDIR)$(ASTVARLIBDIR)/sounds -=-=-"
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
+ $(CMDPREFIX)for x in sounds/demo-*; do \
if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
else \
@@ -782,27 +815,29 @@
exit 1; \
fi; \
done
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
- for x in sounds/*.mp3; do \
+ @echo "-=-=- Installing default MusicOnHold files to $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 -=-=-"
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
+ $(CMDPREFIX)for x in sounds/*.mp3; do \
$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
done
- rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3
- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
- :> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
- for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
+ $(CMDPREFIX)rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3
+ @echo "-=-=- Installing example voicemail box to $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234 -=-=-"
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
+ $(CMDPREFIX):> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
+ $(CMDPREFIX)for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
done
- :> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm
- for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isonphone; do \
+ $(CMDPREFIX):> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm
+ $(CMDPREFIX)for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isonphone; do \
cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm ; \
done
webvmail:
@[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
@[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
- $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
- for x in images/*.gif; do \
+ $(CMDPREFIX)$(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
+ $(CMDPREFIX)for x in images/*.gif; do \
$(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
done
@echo " +--------- Asterisk Web Voicemail ----------+"
@@ -842,13 +877,13 @@
echo "PROJECT_NUMBER=$(ASTERISKVERSION)") | doxygen -
mpg123:
- @wget -V >/dev/null || (echo "You need wget" ; false )
+ $(CMDPREFIX)wget -V >/dev/null || (echo "You need wget" ; false )
[ -f mpg123-0.59r.tar.gz ] || wget http://www.mpg123.de/mpg123/mpg123-0.59r.tar.gz
[ -d mpg123-0.59r ] || tar xfz mpg123-0.59r.tar.gz
$(MAKE) -C mpg123-0.59r $(MPG123TARG)
config:
- if [ -d /etc/rc.d/init.d ]; then \
+ $(CMDPREFIX)if [ -d /etc/rc.d/init.d ]; then \
$(INSTALL) -m 755 contrib/init.d/rc.redhat.asterisk /etc/rc.d/init.d/asterisk; \
/sbin/chkconfig --add asterisk; \
elif [ -d /etc/init.d ]; then \
@@ -860,17 +895,21 @@
valgrind: dont-optimize
depend: include/asterisk/version.h .depend defaults.h
- for x in $(SUBDIRS); do $(MAKE) -C $$x depend || exit 1 ; done
-
-.depend: include/asterisk/version.h
- build_tools/mkdep $(CFLAGS) $(wildcard *.c)
+ $(CMDPREFIX)for x in $(SUBDIRS) stdtime; do \
+ echo "-=-=- Calculating dependencies between files in $$x -=-=-=-" ; \
+ $(MAKE) -C $$x depend || exit 1 ; \
+ done
+
+.depend: include/asterisk/version.h build_tools/mkdep
+ @echo "-=-=- Calculating dependencies between base files -=-=-"
+ $(CMDPREFIX)build_tools/mkdep $(CFLAGS) $(wildcard *.c)
.tags-depend:
@echo -n ".tags-depend: " > $@
@find . -maxdepth 1 -name \*.c -printf "\t%p \\\\\n" >> $@
@find . -maxdepth 1 -name \*.h -printf "\t%p \\\\\n" >> $@
- @find $(SUBDIRS) -name \*.c -printf "\t%p \\\\\n" >> $@
- @find $(SUBDIRS) -name \*.h -printf "\t%p \\\\\n" >> $@
+ @find $(SUBDIRS) stdtime -name \*.c -printf "\t%p \\\\\n" >> $@
+ @find $(SUBDIRS) stdtime -name \*.h -printf "\t%p \\\\\n" >> $@
@find include -name \*.h -printf "\t%p \\\\\n" >> $@
@echo >> $@
@@ -878,8 +917,8 @@
@rm -f $@
@find . -maxdepth 1 -name \*.c -print >> $@
@find . -maxdepth 1 -name \*.h -print >> $@
- @find $(SUBDIRS) -name \*.c -print >> $@
- @find $(SUBDIRS) -name \*.h -print >> $@
+ @find $(SUBDIRS) stdtime -name \*.c -print >> $@
+ @find $(SUBDIRS) stdtime -name \*.h -print >> $@
@find include -name \*.h -print >> $@
tags: .tags-depend .tags-sources
@@ -906,6 +945,6 @@
# We can avoid this by making noclean
cleantest:
- if cmp -s .cleancount .lastclean ; then echo ; else \
+ $(CMDPREFIX)if cmp -s .cleancount .lastclean ; then : ; else \
$(MAKE) clean; cp -f .cleancount .lastclean;\
fi
Modified: team/russell/make_output/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/agi/Makefile?rev=8083&r1=8082&r2=8083&view=diff
==============================================================================
--- team/russell/make_output/agi/Makefile (original)
+++ team/russell/make_output/agi/Makefile Sun Jan 15 19:06:57 2006
@@ -27,8 +27,8 @@
all: depend $(AGIS)
install: all
- mkdir -p $(DESTDIR)$(AGI_DIR)
- for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done
+ $(CMDPREFIX)mkdir -p $(DESTDIR)$(AGI_DIR)
+ $(CMDPREFIX)for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done
eagi-test: eagi-test.o
$(CC) $(CFLAGS) -o eagi-test eagi-test.o $(LIBS)
@@ -37,7 +37,7 @@
$(CC) $(CFLAGS) -o eagi-sphinx-test eagi-sphinx-test.o $(LIBS)
clean:
- rm -f *.so *.o look .depend eagi-test eagi-sphinx-test
+ $(CMDPREFIX)rm -f *.so *.o look .depend eagi-test eagi-sphinx-test
%.so : %.o
$(CC) -shared -Xlinker -x -o $@ $<
@@ -49,4 +49,4 @@
depend: .depend
.depend:
- ../build_tools/mkdep $(CFLAGS) `ls *.c`
+ $(CMDPREFIX)../build_tools/mkdep $(CFLAGS) `ls *.c`
Modified: team/russell/make_output/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/apps/Makefile?rev=8083&r1=8082&r2=8083&view=diff
==============================================================================
--- team/russell/make_output/apps/Makefile (original)
+++ team/russell/make_output/apps/Makefile Sun Jan 15 19:06:57 2006
@@ -82,7 +82,7 @@
all: $(APPS)
clean:
- rm -f *.so *.o look .depend
+ $(CMDPREFIX)rm -f *.so *.o look .depend
%.so : %.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
@@ -91,10 +91,10 @@
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -ltonezone
install: all
- for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
- rm -f $(DESTDIR)$(MODULES_DIR)/app_cut.so
- rm -f $(DESTDIR)$(MODULES_DIR)/app_datetime.so
- rm -f $(DESTDIR)$(MODULES_DIR)/app_qcall.so
+ $(CMDPREFIX)for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+ $(CMDPREFIX)rm -f $(DESTDIR)$(MODULES_DIR)/app_cut.so
+ $(CMDPREFIX)rm -f $(DESTDIR)$(MODULES_DIR)/app_datetime.so
+ $(CMDPREFIX)rm -f $(DESTDIR)$(MODULES_DIR)/app_qcall.so
app_curl.so: app_curl.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CURLLIBS)
@@ -124,7 +124,7 @@
depend: .depend
.depend:
- ../build_tools/mkdep $(CFLAGS) `ls *.c`
+ $(CMDPREFIX)../build_tools/mkdep $(CFLAGS) `ls *.c`
env:
env
Modified: team/russell/make_output/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/cdr/Makefile?rev=8083&r1=8082&r2=8083&view=diff
==============================================================================
--- team/russell/make_output/cdr/Makefile (original)
+++ team/russell/make_output/cdr/Makefile Sun Jan 15 19:06:57 2006
@@ -110,10 +110,10 @@
all: depend $(MODS)
install: all
- for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+ $(CMDPREFIX)for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
clean:
- rm -f *.so *.o .depend
+ $(CMDPREFIX)rm -f *.so *.o .depend
%.so : %.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
@@ -137,4 +137,4 @@
depend: .depend
.depend:
- ../build_tools/mkdep $(CFLAGS) `ls *.c`
+ $(CMDPREFIX)../build_tools/mkdep $(CFLAGS) `ls *.c`
Modified: team/russell/make_output/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/channels/Makefile?rev=8083&r1=8082&r2=8083&view=diff
==============================================================================
--- team/russell/make_output/channels/Makefile (original)
+++ team/russell/make_output/channels/Makefile Sun Jan 15 19:06:57 2006
@@ -148,8 +148,8 @@
all: depend $(CHANNEL_LIBS)
clean:
- rm -f *.so *.o .depend
- rm -f busy.h ringtone.h gentone gentone-ulaw
+ $(CMDPREFIX)rm -f *.so *.o .depend
+ $(CMDPREFIX)rm -f busy.h ringtone.h gentone gentone-ulaw
%.so : %.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} ${LIBS}
@@ -235,13 +235,13 @@
$(CC) $(CFLAGS) -DCHAN_MISDN_VERSION=\"0.2.1\" -c $< -o $@
install: all
- for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
- if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi
+ $(CMDPREFIX)for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+ $(CMDPREFIX)if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi
depend: .depend
.depend:
- ../build_tools/mkdep $(CFLAGS) `ls *.c`
+ $(CMDPREFIX)../build_tools/mkdep $(CFLAGS) `ls *.c`
env:
env
Modified: team/russell/make_output/channels/misdn/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/channels/misdn/Makefile?rev=8083&r1=8082&r2=8083&view=diff
==============================================================================
--- team/russell/make_output/channels/misdn/Makefile (original)
+++ team/russell/make_output/channels/misdn/Makefile Sun Jan 15 19:06:57 2006
@@ -30,5 +30,5 @@
FORCE:
clean:
- rm -rf *.a *.o *.so
- rm -rf lib
+ $(CMDPREFIX)rm -rf *.a *.o *.so
+ $(CMDPREFIX)rm -rf lib
Modified: team/russell/make_output/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/codecs/Makefile?rev=8083&r1=8082&r2=8083&view=diff
==============================================================================
--- team/russell/make_output/codecs/Makefile (original)
+++ team/russell/make_output/codecs/Makefile Sun Jan 15 19:06:57 2006
@@ -85,12 +85,12 @@
all: depend $(CODECS)
clean:
- rm -f *.so *.o .depend
- [ ! -d g723.1 ] || $(MAKE) -C g723.1 clean
- [ ! -d g723.1b ] || $(MAKE) -C g723.1b clean
- $(MAKE) -C gsm clean
- $(MAKE) -C lpc10 clean
- $(MAKE) -C ilbc clean
+ $(CMDPREFIX)rm -f *.so *.o .depend
+ $(CMDPREFIX)[ ! -d g723.1 ] || $(MAKE) -C g723.1 clean
+ $(CMDPREFIX)[ ! -d g723.1b ] || $(MAKE) -C g723.1b clean
+ $(CMDPREFIX)$(MAKE) -C gsm clean
+ $(CMDPREFIX)$(MAKE) -C lpc10 clean
+ $(CMDPREFIX)$(MAKE) -C ilbc clean
$(LIBG723):
$(MAKE) -C g723.1 all
@@ -136,9 +136,9 @@
endif
install: all
- for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+ $(CMDPREFIX)for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
depend: .depend
.depend:
- ../build_tools/mkdep $(CFLAGS) `ls *.c`
+ $(CMDPREFIX)../build_tools/mkdep $(CFLAGS) `ls *.c`
Modified: team/russell/make_output/codecs/gsm/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/codecs/gsm/Makefile?rev=8083&r1=8082&r2=8083&view=diff
==============================================================================
--- team/russell/make_output/codecs/gsm/Makefile (original)
+++ team/russell/make_output/codecs/gsm/Makefile Sun Jan 15 19:06:57 2006
@@ -505,19 +505,19 @@
@-echo uninstall: Done.
semi-clean:
- -rm $(RMFLAGS) */*.o \
+ $(CMDPREFIX)rm $(RMFLAGS) */*.o \
$(TST)/lin2cod $(TST)/lin2txt \
$(TST)/cod2lin $(TST)/cod2txt \
$(TST)/gsm2cod \
$(TST)/*.*.*
- -$(FIND) . \( -name core -o -name foo \) \
+ $(CMDPREFIX)$(FIND) . \( -name core -o -name foo \) \
-print | xargs rm $(RMFLAGS)
clean: semi-clean
- -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \
+ $(CMDPREFIX)rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \
$(TOAST) $(TCAT) $(UNTOAST) \
$(ROOT)/gsm-1.0.tar.Z
- rm -rf lib
+ $(CMDPREFIX)rm -rf lib
# Two tools that helped me generate gsm_encode.c and gsm_decode.c,
# but aren't generally needed to port this.
Modified: team/russell/make_output/codecs/ilbc/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/codecs/ilbc/Makefile?rev=8083&r1=8082&r2=8083&view=diff
==============================================================================
--- team/russell/make_output/codecs/ilbc/Makefile (original)
+++ team/russell/make_output/codecs/ilbc/Makefile Sun Jan 15 19:06:57 2006
@@ -19,7 +19,7 @@
ranlib $(LIB)
clean:
- rm -f $(LIB) *.o
+ $(CMDPREFIX)rm -f $(LIB) *.o
install:
Modified: team/russell/make_output/codecs/lpc10/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/codecs/lpc10/Makefile?rev=8083&r1=8082&r2=8083&view=diff
==============================================================================
--- team/russell/make_output/codecs/lpc10/Makefile (original)
+++ team/russell/make_output/codecs/lpc10/Makefile Sun Jan 15 19:06:57 2006
@@ -72,4 +72,4 @@
ranlib $@
clean:
- -rm -f *.o $(LIB)
+ $(CMDPREFIX)rm -f *.o $(LIB)
Modified: team/russell/make_output/cygwin/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/cygwin/Makefile?rev=8083&r1=8082&r2=8083&view=diff
==============================================================================
--- team/russell/make_output/cygwin/Makefile (original)
+++ team/russell/make_output/cygwin/Makefile Sun Jan 15 19:06:57 2006
@@ -3,4 +3,4 @@
$(OBJS) : %.o: %.c
$(CC) $< -o asterisk.exe
clean:
- rm -f asterisk.exe
+ $(CMDPREFIX)rm -f asterisk.exe
Modified: team/russell/make_output/db1-ast/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/db1-ast/Makefile?rev=8083&r1=8082&r2=8083&view=diff
==============================================================================
--- team/russell/make_output/db1-ast/Makefile (original)
+++ team/russell/make_output/db1-ast/Makefile Sun Jan 15 19:06:57 2006
@@ -43,7 +43,7 @@
$(CC) -o $@ db_dump185.o -L. -ldb
clean:
- rm -f $(LIBDB) $(LIBDBSO) $(OBJS) $(SHOBJS)
+ $(CMDPREFIX)rm -f $(LIBDB) $(LIBDBSO) $(OBJS) $(SHOBJS)
OORG= -O2
CL= $(CC) -Wall -c -D__DBINTERFACE_PRIVATE $(OORG) -I. -Iinclude
Modified: team/russell/make_output/editline/Makefile.in
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/editline/Makefile.in?rev=8083&r1=8082&r2=8083&view=diff
==============================================================================
--- team/russell/make_output/editline/Makefile.in (original)
+++ team/russell/make_output/editline/Makefile.in Sun Jan 15 19:06:57 2006
@@ -173,13 +173,13 @@
done
clean :
- rm -f $(AGCSRCS) $(BGCSRCS) $(AGHDRS) $(BGHDRS) $(LIB_A) $(LIB_S)
- rm -f $(BGCSRCS:.c=.o_a) $(CCSRCS:.c=.o_a)
- rm -f $(BGCSRCS:.c=.o_s) $(CCSRCS:.c=.o_s)
- rm -f $(TCSRCS:.c=.o) $(TEST)
+ $(CMDPREFIX)rm -f $(AGCSRCS) $(BGCSRCS) $(AGHDRS) $(BGHDRS) $(LIB_A) $(LIB_S)
+ $(CMDPREFIX)rm -f $(BGCSRCS:.c=.o_a) $(CCSRCS:.c=.o_a)
+ $(CMDPREFIX)rm -f $(BGCSRCS:.c=.o_s) $(CCSRCS:.c=.o_s)
+ $(CMDPREFIX)rm -f $(TCSRCS:.c=.o) $(TEST)
distclean : clean
- rm -f config.cache config.log config.status config.h Makefile
+ $(CMDPREFIX)rm -f config.cache config.log config.status config.h Makefile
#
# Internal targets and rules.
Modified: team/russell/make_output/formats/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/formats/Makefile?rev=8083&r1=8082&r2=8083&view=diff
==============================================================================
--- team/russell/make_output/formats/Makefile (original)
+++ team/russell/make_output/formats/Makefile Sun Jan 15 19:06:57 2006
@@ -44,7 +44,7 @@
all: depend $(FORMAT_LIBS)
clean:
- rm -f *.so *.o .depend
+ $(CMDPREFIX)rm -f *.so *.o .depend
%.so : %.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
@@ -60,9 +60,9 @@
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm
install: all
- for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+ $(CMDPREFIX)for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
depend: .depend
.depend:
- ../build_tools/mkdep $(CFLAGS) `ls *.c`
+ $(CMDPREFIX)../build_tools/mkdep $(CFLAGS) `ls *.c`
Modified: team/russell/make_output/funcs/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/funcs/Makefile?rev=8083&r1=8082&r2=8083&view=diff
==============================================================================
--- team/russell/make_output/funcs/Makefile (original)
+++ team/russell/make_output/funcs/Makefile Sun Jan 15 19:06:57 2006
@@ -54,7 +54,7 @@
all: $(FUNCS)
clean:
- rm -f *.so *.o .depend pbx_functions.h
+ $(CMDPREFIX)rm -f *.so *.o .depend pbx_functions.h
%.so : %.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
@@ -63,9 +63,9 @@
pbx_functions.h: $(FUNC_SOURCES)
@echo "/* Automatically generated - do not edit */" > $@
- @for f in $(FUNC_SOURCES); do echo "#include \"$$f\"" >> $@; done
+ $(CMDPREFIX)for f in $(FUNC_SOURCES); do echo "#include \"$$f\"" >> $@; done
@echo "static struct ast_custom_function *builtins[] = {" >> $@
- @for f in $(FUNC_STRUCTS); do echo "&$$f," >> $@; done
+ $(CMDPREFIX)for f in $(FUNC_STRUCTS); do echo "&$$f," >> $@; done
@echo "};" >> $@
pbx_functions.o: pbx_functions.h
@@ -77,7 +77,7 @@
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc
install: all
- for x in $(FUNCS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+ $(CMDPREFIX)for x in $(FUNCS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
ifneq ($(wildcard .depend),)
include .depend
@@ -86,7 +86,7 @@
depend: .depend
.depend: pbx_functions.h
- ../build_tools/mkdep $(CFLAGS) `ls *.c`
+ $(CMDPREFIX)../build_tools/mkdep $(CFLAGS) `ls *.c`
env:
env
Modified: team/russell/make_output/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/pbx/Makefile?rev=8083&r1=8082&r2=8083&view=diff
==============================================================================
--- team/russell/make_output/pbx/Makefile (original)
+++ team/russell/make_output/pbx/Makefile Sun Jan 15 19:06:57 2006
@@ -41,7 +41,7 @@
all: depend $(PBX_LIBS)
clean:
- rm -f *.so *.o .depend
+ $(CMDPREFIX)rm -f *.so *.o .depend
pbx_gtkconsole.o: pbx_gtkconsole.c
$(CC) $(CFLAGS) $(GTK_FLAGS) -c -o $@ $<
@@ -72,9 +72,9 @@
endif
install: all
- for x in $(PBX_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+ $(CMDPREFIX)for x in $(PBX_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
depend: .depend
.depend:
- ../build_tools/mkdep $(CFLAGS) `ls *.c`
+ $(CMDPREFIX)../build_tools/mkdep $(CFLAGS) `ls *.c`
Modified: team/russell/make_output/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_output/res/Makefile?rev=8083&r1=8082&r2=8083&view=diff
==============================================================================
--- team/russell/make_output/res/Makefile (original)
+++ team/russell/make_output/res/Makefile Sun Jan 15 19:06:57 2006
@@ -72,10 +72,10 @@
all: depend $(MODS)
install: all
- rm -f $(DESTDIR)$(ASTHEADERDIR)/parking.h
- rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so
- rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so
- for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+ $(CMDPREFIX)rm -f $(DESTDIR)$(ASTHEADERDIR)/parking.h
+ $(CMDPREFIX)rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so
+ $(CMDPREFIX)rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so
+ $(CMDPREFIX)for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
@if [ x`which mpg123 2>/dev/null | grep -v '^no'` != x ] ; then \
if mpg123 --longhelp 2>&1 | grep -q .59r 2>&1 >/dev/null ; then echo ; else \
echo "*************************************************************";\
@@ -92,7 +92,7 @@
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CRYPTO_LIBS)
clean:
- rm -f *.so *.o .depend
+ $(CMDPREFIX)rm -f *.so *.o .depend
res_odbc.so: res_odbc.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc
@@ -116,7 +116,7 @@
depend: .depend
.depend:
- ../build_tools/mkdep $(CFLAGS) `ls *.c`
[... 58 lines stripped ...]
More information about the asterisk-commits
mailing list