rename these files so as to avoid conflicts when users update their working copies and have unversioned files already in place

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@159571 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Kevin P. Fleming 17 years ago
parent 7459a56dbb
commit a738a1f6e7

@ -94,11 +94,11 @@ gentone: gentone.c
$(CMD_PREFIX) $(HOST_CC) $(STATIC_BUILD) -o $@ $(HOST_CFLAGS) $(HOST_LDFLAGS) $^ $(LIBS) $(CMD_PREFIX) $(HOST_CC) $(STATIC_BUILD) -o $@ $(HOST_CFLAGS) $(HOST_LDFLAGS) $^ $(LIBS)
gentone: LIBS+=-lm gentone: LIBS+=-lm
busy.h: busy_tone.h:
./gentone busy 480 620 ./gentone busy_tone 480 620
ringtone.h: ring_tone.h:
./gentone ringtone 440 480 ./gentone ring_tone 440 480
$(if $(filter chan_iax2,$(EMBEDDED_MODS)),modules.link,chan_iax2.so): iax2-parser.o iax2-provision.o $(if $(filter chan_iax2,$(EMBEDDED_MODS)),modules.link,chan_iax2.so): iax2-parser.o iax2-provision.o

@ -63,8 +63,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/abstract_jb.h" #include "asterisk/abstract_jb.h"
#include "asterisk/musiconhold.h" #include "asterisk/musiconhold.h"
#include "busy.h" #include "busy_tone.h"
#include "ringtone.h" #include "ring_tone.h"
#include "ring10.h" #include "ring10.h"
#include "answer.h" #include "answer.h"

@ -77,8 +77,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/musiconhold.h" #include "asterisk/musiconhold.h"
/* ringtones we use */ /* ringtones we use */
#include "busy.h" #include "busy_tone.h"
#include "ringtone.h" #include "ring_tone.h"
#include "ring10.h" #include "ring10.h"
#include "answer.h" #include "answer.h"

Loading…
Cancel
Save