Skip to content

F
freeswitch
提交 6e81dda1 authored 作者: Michael Jerris's avatar Michael Jerris
浏览文件
操作

Fix re-generation of switch_version.h 

remove some un-used and un-necessary shell scripts



git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4578 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 1481d37f
隐藏空白字符变更
内嵌 并排
正在显示 包含 52 行增加 和 60 行删除
Makefile.am
浏览文件 @ 6e81dda1
...@@ -61,7 +61,6 @@ src/include/switch_regex.h\ ...@@ -61,7 +61,6 @@ src/include/switch_regex.h\
src/include/switch_types.h\ src/include/switch_types.h\
src/include/switch_utils.h\ src/include/switch_utils.h\
src/include/switch_rtp.h\ src/include/switch_rtp.h\
src/include/switch_version.h\
src/include/switch_stun.h\ src/include/switch_stun.h\
src/include/switch_log.h\ src/include/switch_log.h\
src/include/switch_xml.h src/include/switch_xml.h
...@@ -91,10 +90,11 @@ $(libfreeswitch_la_SOURCES): deps ...@@ -91,10 +90,11 @@ $(libfreeswitch_la_SOURCES): deps
MOD_LINK = $(BASE)/libfreeswitch.la MOD_LINK = $(BASE)/libfreeswitch.la
CLEANFILES = src/include/switch_version.h CLEANFILES = src/include/switch_version.h
BUILT_SOURCES = src/include/switch_version.h
bin_PROGRAMS = freeswitch bin_PROGRAMS = freeswitch
freeswitch_SOURCES = src/switch.c\ freeswitch_SOURCES = src/switch.c
src/include/switch_version.h nodist_freeswitch_SOURCES = src/include/switch_version.h
freeswitch_CFLAGS = $(AM_CFLAGS) freeswitch_CFLAGS = $(AM_CFLAGS)
freeswitch_LDADD = ${MOD_LINK} freeswitch_LDADD = ${MOD_LINK}
...@@ -112,12 +112,20 @@ install-data-local: ...@@ -112,12 +112,20 @@ install-data-local:
$(INSTALL) ./$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ;\ $(INSTALL) ./$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ;\
fi fi
version: Makefile src/include/switch_version.h .version:
MAKE=$(MAKE) ./build/checkversion.sh touch .version
newversion: Makefile src/include/switch_version.h: $(top_srcdir)/src/include/switch_version.h.in .version $(libfreeswitch_la_SOURCES) $(library_include_HEADERS)
MAKE=$(MAKE) ./build/checkversion.sh force @if test ! -f .noversion ; then \
$(MAKE) force=0 ; \
version=`svnversion . -n || echo hacked` ; \
oldversion=`cat .version 2>/dev/null || echo "0"` ; \
test ! -f src/include/switch_version.h || grep "@SVN_VERSION@" src/include/switch_version.h && force=1 ; \
if test "$$oldversion" != "$$version" || test $$force = 1 ; then \
cat src/include/switch_version.h.in | sed "s/@SVN_VERSION@/$$version/g" > src/include/switch_version.h ; \
echo $$version > .version ; \
fi ; \
fi ;
.nodepends: .nodepends:
touch .nodepends touch .nodepends
...@@ -148,7 +156,7 @@ resample: ...@@ -148,7 +156,7 @@ resample:
teletone: teletone:
cd libs/libteletone && $(MAKE) cd libs/libteletone && $(MAKE)
deps: version sqlite apr apr-util pcre srtp resample teletone deps: sqlite apr apr-util pcre srtp resample teletone
core: deps libfreeswitch.la core: deps libfreeswitch.la
......
Makefile.in
浏览文件 @ 6e81dda1
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
SOURCES = $(libfreeswitch_la_SOURCES) $(nodist_libfreeswitch_la_SOURCES) $(freeswitch_SOURCES) SOURCES = $(libfreeswitch_la_SOURCES) $(nodist_libfreeswitch_la_SOURCES) $(freeswitch_SOURCES) $(nodist_freeswitch_SOURCES)
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
...@@ -46,8 +46,7 @@ DIST_COMMON = README $(am__configure_deps) $(library_include_HEADERS) \ ...@@ -46,8 +46,7 @@ DIST_COMMON = README $(am__configure_deps) $(library_include_HEADERS) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/build/modmake.rules.in $(top_srcdir)/configure \ $(top_srcdir)/build/modmake.rules.in $(top_srcdir)/configure \
$(top_srcdir)/src/include/switch_am_config.h.in \ $(top_srcdir)/src/include/switch_am_config.h.in \
$(top_srcdir)/src/include/switch_private.h.in \ $(top_srcdir)/src/include/switch_private.h.in AUTHORS COPYING \
$(top_srcdir)/src/include/switch_version.h.in AUTHORS COPYING \
ChangeLog INSTALL NEWS build/config/compile \ ChangeLog INSTALL NEWS build/config/compile \
build/config/config.guess build/config/config.sub \ build/config/config.guess build/config/config.sub \
build/config/depcomp build/config/install-sh \ build/config/depcomp build/config/install-sh \
...@@ -70,7 +69,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ ...@@ -70,7 +69,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
mkinstalldirs = $(install_sh) -d mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h
CONFIG_CLEAN_FILES = src/include/switch_am_config.h \ CONFIG_CLEAN_FILES = src/include/switch_am_config.h \
build/modmake.rules src/include/switch_version.h build/modmake.rules
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \ am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
...@@ -109,7 +108,9 @@ libfreeswitch_la_OBJECTS = $(am_libfreeswitch_la_OBJECTS) \ ...@@ -109,7 +108,9 @@ libfreeswitch_la_OBJECTS = $(am_libfreeswitch_la_OBJECTS) \
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS) PROGRAMS = $(bin_PROGRAMS)
am_freeswitch_OBJECTS = freeswitch-switch.$(OBJEXT) am_freeswitch_OBJECTS = freeswitch-switch.$(OBJEXT)
freeswitch_OBJECTS = $(am_freeswitch_OBJECTS) nodist_freeswitch_OBJECTS =
freeswitch_OBJECTS = $(am_freeswitch_OBJECTS) \
$(nodist_freeswitch_OBJECTS)
am__DEPENDENCIES_2 = $(BASE)/libfreeswitch.la am__DEPENDENCIES_2 = $(BASE)/libfreeswitch.la
freeswitch_DEPENDENCIES = $(am__DEPENDENCIES_2) freeswitch_DEPENDENCIES = $(am__DEPENDENCIES_2)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include
...@@ -124,7 +125,8 @@ CCLD = $(CC) ...@@ -124,7 +125,8 @@ CCLD = $(CC)
LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@ $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libfreeswitch_la_SOURCES) \ SOURCES = $(libfreeswitch_la_SOURCES) \
$(nodist_libfreeswitch_la_SOURCES) $(freeswitch_SOURCES) $(nodist_libfreeswitch_la_SOURCES) $(freeswitch_SOURCES) \
$(nodist_freeswitch_SOURCES)
DIST_SOURCES = $(libfreeswitch_la_SOURCES) $(freeswitch_SOURCES) DIST_SOURCES = $(libfreeswitch_la_SOURCES) $(freeswitch_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \ html-recursive info-recursive install-data-recursive \
...@@ -329,7 +331,6 @@ src/include/switch_regex.h\ ...@@ -329,7 +331,6 @@ src/include/switch_regex.h\
src/include/switch_types.h\ src/include/switch_types.h\
src/include/switch_utils.h\ src/include/switch_utils.h\
src/include/switch_rtp.h\ src/include/switch_rtp.h\
src/include/switch_version.h\
src/include/switch_stun.h\ src/include/switch_stun.h\
src/include/switch_log.h\ src/include/switch_log.h\
src/include/switch_xml.h src/include/switch_xml.h
...@@ -353,12 +354,13 @@ libfreeswitch_la_LIBADD = $(CORE_LIBS) ...@@ -353,12 +354,13 @@ libfreeswitch_la_LIBADD = $(CORE_LIBS)
nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h
MOD_LINK = $(BASE)/libfreeswitch.la MOD_LINK = $(BASE)/libfreeswitch.la
CLEANFILES = src/include/switch_version.h CLEANFILES = src/include/switch_version.h
freeswitch_SOURCES = src/switch.c\ BUILT_SOURCES = src/include/switch_version.h
src/include/switch_version.h freeswitch_SOURCES = src/switch.c
nodist_freeswitch_SOURCES = src/include/switch_version.h
freeswitch_CFLAGS = $(AM_CFLAGS) freeswitch_CFLAGS = $(AM_CFLAGS)
freeswitch_LDADD = ${MOD_LINK} freeswitch_LDADD = ${MOD_LINK}
all: all-recursive all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .c .lo .o .obj .SUFFIXES: .c .lo .o .obj
...@@ -416,8 +418,6 @@ src/include/switch_am_config.h: $(top_builddir)/config.status $(top_srcdir)/src/ ...@@ -416,8 +418,6 @@ src/include/switch_am_config.h: $(top_builddir)/config.status $(top_srcdir)/src/
cd $(top_builddir) && $(SHELL) ./config.status $@ cd $(top_builddir) && $(SHELL) ./config.status $@
build/modmake.rules: $(top_builddir)/config.status $(top_srcdir)/build/modmake.rules.in build/modmake.rules: $(top_builddir)/config.status $(top_srcdir)/build/modmake.rules.in
cd $(top_builddir) && $(SHELL) ./config.status $@ cd $(top_builddir) && $(SHELL) ./config.status $@
src/include/switch_version.h: $(top_builddir)/config.status $(top_srcdir)/src/include/switch_version.h.in
cd $(top_builddir) && $(SHELL) ./config.status $@
install-libLTLIBRARIES: $(lib_LTLIBRARIES) install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
...@@ -956,7 +956,8 @@ distcleancheck: distclean ...@@ -956,7 +956,8 @@ distcleancheck: distclean
$(distcleancheck_listfiles) ; \ $(distcleancheck_listfiles) ; \
exit 1; } >&2 exit 1; } >&2
check-am: all-am check-am: all-am
check: check-recursive check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-recursive
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
install-binPROGRAMS: install-libLTLIBRARIES install-binPROGRAMS: install-libLTLIBRARIES
...@@ -965,7 +966,8 @@ installdirs-am: ...@@ -965,7 +966,8 @@ installdirs-am:
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(library_includedir)"; do \ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(library_includedir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \ test -z "$$dir" || $(mkdir_p) "$$dir"; \
done done
install: install-recursive install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-recursive
install-exec: install-exec-recursive install-exec: install-exec-recursive
install-data: install-data-recursive install-data: install-data-recursive
uninstall: uninstall-recursive uninstall: uninstall-recursive
...@@ -990,6 +992,7 @@ distclean-generic: ...@@ -990,6 +992,7 @@ distclean-generic:
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
clean: clean-recursive clean: clean-recursive
clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
...@@ -1085,12 +1088,20 @@ install-data-local: ...@@ -1085,12 +1088,20 @@ install-data-local:
$(INSTALL) ./$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ;\ $(INSTALL) ./$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ;\
fi fi
version: Makefile src/include/switch_version.h .version:
MAKE=$(MAKE) ./build/checkversion.sh touch .version
newversion: Makefile src/include/switch_version.h: $(top_srcdir)/src/include/switch_version.h.in .version $(libfreeswitch_la_SOURCES) $(library_include_HEADERS)
MAKE=$(MAKE) ./build/checkversion.sh force @if test ! -f .noversion ; then \
$(MAKE) force=0 ; \
version=`svnversion . -n || echo hacked` ; \
oldversion=`cat .version 2>/dev/null || echo "0"` ; \
test ! -f src/include/switch_version.h || grep "@SVN_VERSION@" src/include/switch_version.h && force=1 ; \
if test "$$oldversion" != "$$version" || test $$force = 1 ; then \
cat src/include/switch_version.h.in | sed "s/@SVN_VERSION@/$$version/g" > src/include/switch_version.h ; \
echo $$version > .version ; \
fi ; \
fi ;
.nodepends: .nodepends:
touch .nodepends touch .nodepends
...@@ -1121,7 +1132,7 @@ resample: ...@@ -1121,7 +1132,7 @@ resample:
teletone: teletone:
cd libs/libteletone && $(MAKE) cd libs/libteletone && $(MAKE)
deps: version sqlite apr apr-util pcre srtp resample teletone deps: sqlite apr apr-util pcre srtp resample teletone
core: deps libfreeswitch.la core: deps libfreeswitch.la
......
build/addenv.sh deleted 100755 → 0
浏览文件 @ 1481d37f
#!/bin/sh
echo "$2=\"$3\" ; export $2" >> $1
build/build.sh deleted 100755 → 0
浏览文件 @ 1481d37f
cd .. && make depends && make install modules install_mod
build/checkversion.sh deleted 100755 → 0
浏览文件 @ 1481d37f
#!/bin/sh
if [ -f .noversion ] ; then
exit
fi
if eval test x${1} = xforce ; then
rm -f .version
fi
force=0
version=`svnversion . -n || echo hacked`
oldversion=`cat .version 2>/dev/null || echo "0"`
grep "@SVN_VERSION@" src/include/switch_version.h && force=1
if [ $oldversion != $version ] || [ $force = 1 ] ; then
cat src/include/switch_version.h.in | sed "s/@SVN_VERSION@/$version/g" > src/include/switch_version.h
echo $version > .version
fi
configure
浏览文件 @ 6e81dda1
...@@ -25211,8 +25211,6 @@ subdirs="$subdirs libs/xmlrpc-c" ...@@ -25211,8 +25211,6 @@ subdirs="$subdirs libs/xmlrpc-c"
subdirs="$subdirs libs/portaudio" subdirs="$subdirs libs/portaudio"
ac_config_files="$ac_config_files src/include/switch_version.h"
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure # This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure # tests run on this system so they can be shared between configure
...@@ -25808,7 +25806,6 @@ do ...@@ -25808,7 +25806,6 @@ do
"src/mod/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/mod/Makefile" ;; "src/mod/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/mod/Makefile" ;;
"src/include/switch_am_config.h" ) CONFIG_FILES="$CONFIG_FILES src/include/switch_am_config.h" ;; "src/include/switch_am_config.h" ) CONFIG_FILES="$CONFIG_FILES src/include/switch_am_config.h" ;;
"build/modmake.rules" ) CONFIG_FILES="$CONFIG_FILES build/modmake.rules" ;; "build/modmake.rules" ) CONFIG_FILES="$CONFIG_FILES build/modmake.rules" ;;
"src/include/switch_version.h" ) CONFIG_FILES="$CONFIG_FILES src/include/switch_version.h" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"src/include/switch_private.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/include/switch_private.h" ;; "src/include/switch_private.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/include/switch_private.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
......
configure.in
浏览文件 @ 6e81dda1
...@@ -314,5 +314,4 @@ AC_CONFIG_SUBDIRS(libs/speex) ...@@ -314,5 +314,4 @@ AC_CONFIG_SUBDIRS(libs/speex)
AC_CONFIG_SUBDIRS(libs/xmlrpc-c) AC_CONFIG_SUBDIRS(libs/xmlrpc-c)
AC_CONFIG_SUBDIRS(libs/portaudio) AC_CONFIG_SUBDIRS(libs/portaudio)
AC_OUTPUT
AC_OUTPUT([src/include/switch_version.h])
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论