kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-18 18:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

various cleanups, remove support for CVS checkouts

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@34844 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-06-19 15:17:32 +00:00
parent aa8efe1783
commit 487adb43e2
1 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Makefile
View File

@@ -263,15 +263,8 @@ else
RPMVERSION=unknown RPMVERSION=unknown
endif endif
# CVS mirrors of SVN have .svnrevision files showing ifneq ($(wildcard .svn),)
# which SVN revision they are based on, and .svnbranch
# showing the branch they are made from
ifneq ($(wildcard .svnrevision),)
ASTERISKVERSIONNUM=999999 ASTERISKVERSIONNUM=999999
else
ifneq ($(wildcard .svn),)
ASTERISKVERSIONNUM=999999
endif
endif endif
ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS) ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS)
@@ -458,21 +451,21 @@ asterisk.txt: asterisk.sgml
defaults.h: makeopts defaults.h: makeopts
@build_tools/make_defaults_h > $@.tmp @build_tools/make_defaults_h > $@.tmp
@if cmp -s $@.tmp $@ ; then echo ; else \ @if cmp -s $@.tmp $@ ; then : ; else \
mv $@.tmp $@ ; \ mv $@.tmp $@ ; \
fi fi
@rm -f $@.tmp @rm -f $@.tmp
include/asterisk/version.h: include/asterisk/version.h:
@build_tools/make_version_h > $@.tmp @build_tools/make_version_h > $@.tmp
@if cmp -s $@.tmp $@ ; then echo; else \ @if cmp -s $@.tmp $@ ; then : ; else \
mv $@.tmp $@ ; \ mv $@.tmp $@ ; \
fi fi
@rm -f $@.tmp @rm -f $@.tmp
include/asterisk/buildopts.h: menuselect.makeopts include/asterisk/buildopts.h: menuselect.makeopts
@build_tools/make_buildopts_h > $@.tmp @build_tools/make_buildopts_h > $@.tmp
@if cmp -s $@.tmp $@ ; then echo; else \ @if cmp -s $@.tmp $@ ; then : ; else \
mv $@.tmp $@ ; \ mv $@.tmp $@ ; \
fi fi
@rm -f $@.tmp @rm -f $@.tmp
@@ -547,16 +540,6 @@ update:
fi ; \ fi ; \
rm -f update.out; \ rm -f update.out; \
$(MAKE) clean-depend; \ $(MAKE) clean-depend; \
elif [ -d CVS ]; then \
echo "Updating from CVS..." ; \
cvs -q -z3 update -Pd | tee update.out; \
rm -f .version; \
if [ `grep -c ^C update.out` -gt 0 ]; then \
echo ; echo "The following files have conflicts:" ; \
grep ^C update.out | cut -d' ' -f2- ; \
fi ; \
rm -f update.out; \
$(MAKE) clean-depend; \
else \ else \
echo "Not under version control"; \ echo "Not under version control"; \
fi fi
@@ -603,11 +586,7 @@ bininstall: all
$(INSTALL) -m 644 contrib/scripts/astgenkey.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/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
$(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
if [ -d contrib/firmware/iax ]; then \
$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
else \
echo "You need to do cvs update -d not just cvs update" ; \
fi
install-subdirs: install-subdirs:
@for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done @for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done