[Freeswitch-branches] [commit] r1751 - freeswitch/branches/stkn
Freeswitch SVN
stkn at freeswitch.org
Tue Jul 4 18:39:18 EDT 2006
Author: stkn
Date: Tue Jul 4 18:39:17 2006
New Revision: 1751
Modified:
freeswitch/branches/stkn/Makefile.am
freeswitch/branches/stkn/Makefile.in
freeswitch/branches/stkn/fsxs.in
Log:
Integrate fsxs into buildsystem
Modified: freeswitch/branches/stkn/Makefile.am
==============================================================================
--- freeswitch/branches/stkn/Makefile.am (original)
+++ freeswitch/branches/stkn/Makefile.am Tue Jul 4 18:39:17 2006
@@ -1,3 +1,5 @@
+
+
EXTRA_DIST =
SUBDIRS =
AUTOMAKE_OPTS = gnu foreign
@@ -122,7 +124,7 @@
src/include/switch_xml.h
BUILT_SOURCES = version depends
-CLEANFILES = src/include/switch_version.h
+CLEANFILES = src/include/switch_version.h fsxs
lib_LTLIBRARIES = libfreeswitch.la
@@ -132,6 +134,7 @@
nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h
bin_PROGRAMS = freeswitch
+bin_SCRIPTS = fsxs
freeswitch_SOURCES = src/switch.c\
src/include/switch_version.h
freeswitch_CFLAGS = $(AM_CFLAGS)
@@ -230,6 +233,27 @@
dox:
cd docs && doxygen $(PWD)/docs/Doxygen.conf
+
+fsxs: fsxs.in
+ @echo creating fsxs
+ @sed -e "s, at MODULES_DIR\@,$(PREFIX)/mod," \
+ -e "s, at LIB_DIR\@,$(PREFIX)/lib," \
+ -e "s, at BIN_DIR\@,$(PREFIX)/bin," \
+ -e "s, at INC_DIR\@,$(PREFIX)/include," \
+ -e "s, at CFG_DIR\@,$(PREFIX)/conf," \
+ -e "s, at DB_DIR\@,$(PREFIX)/db," \
+ -e "s, at PREFIX\@,$(PREFIX)," \
+ -e "s, at CC\@,$(CC)," \
+ -e "s, at LD\@,$(CC)," \
+ -e "s, at INSTALL\@,$(INSTALL)," \
+ -e "s, at MKINSTALLDIRS\@,$(mkdir_p)," \
+ \
+ -e "s|@CFLAGS\@|$(CFLAGS) -fPIC $(shell $(APR_CONFIG) --cflags --cppflags)|" \
+ -e "s|@INCLUDES\@|-I$(PREFIX)/include $(shell $(APR_CONFIG) --includes) $(shell $(APU_CONFIG) --includes)|" \
+ -e "s|@SOLINK\@|$(SOLINK)|" \
+ -e "s|@LDFLAGS\@|-L$(PREFIX)/lib|" \
+ -e "s|@LIBS\@|-lfreeswitch|" \
+ fsxs.in > fsxs
eclean: clean
rm -f `find . -type f -name \*~`
Modified: freeswitch/branches/stkn/Makefile.in
==============================================================================
--- freeswitch/branches/stkn/Makefile.in (original)
+++ freeswitch/branches/stkn/Makefile.in Tue Jul 4 18:39:17 2006
@@ -16,6 +16,7 @@
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -70,7 +71,7 @@
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
- "$(DESTDIR)$(library_includedir)"
+ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(library_includedir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libfreeswitch_la_DEPENDENCIES =
@@ -95,6 +96,8 @@
am_freeswitch_OBJECTS = freeswitch-switch.$(OBJEXT)
freeswitch_OBJECTS = $(am_freeswitch_OBJECTS)
freeswitch_DEPENDENCIES = ${top_builddir}/libfreeswitch.la
+binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(bin_SCRIPTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include
depcomp = $(SHELL) $(top_srcdir)/build/config/depcomp
am__depfiles_maybe = depfiles
@@ -339,12 +342,13 @@
src/include/switch_xml.h
BUILT_SOURCES = version depends
-CLEANFILES = src/include/switch_version.h
+CLEANFILES = src/include/switch_version.h fsxs
lib_LTLIBRARIES = libfreeswitch.la
libfreeswitch_la_CFLAGS = $(AM_CFLAGS) -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -std=c99
libfreeswitch_la_LDFLAGS = -version-info 1:0:0
libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lspeakup
nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h
+bin_SCRIPTS = fsxs
freeswitch_SOURCES = src/switch.c\
src/include/switch_version.h
@@ -467,7 +471,26 @@
freeswitch$(EXEEXT): $(freeswitch_OBJECTS) $(freeswitch_DEPENDENCIES)
@rm -f freeswitch$(EXEEXT)
$(LINK) $(freeswitch_LDFLAGS) $(freeswitch_OBJECTS) $(freeswitch_LDADD) $(LIBS)
+install-binSCRIPTS: $(bin_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+ @list='$(bin_SCRIPTS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f $$d$$p; then \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
+ else :; fi; \
+ done
+uninstall-binSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_SCRIPTS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
+ done
+
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -935,12 +958,12 @@
check-am: all-am
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-recursive
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(HEADERS)
install-binPROGRAMS: install-libLTLIBRARIES
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(library_includedir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(library_includedir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -994,7 +1017,8 @@
install-data-am: install-library_includeHEADERS
-install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+install-exec-am: install-binPROGRAMS install-binSCRIPTS \
+ install-libLTLIBRARIES
install-info: install-info-recursive
@@ -1022,8 +1046,9 @@
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
- uninstall-libLTLIBRARIES uninstall-library_includeHEADERS
+uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
+ uninstall-info-am uninstall-libLTLIBRARIES \
+ uninstall-library_includeHEADERS
uninstall-info: uninstall-info-recursive
@@ -1035,16 +1060,16 @@
distclean-generic distclean-hdr distclean-libtool \
distclean-recursive distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-binPROGRAMS install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-libLTLIBRARIES \
+ install install-am install-binPROGRAMS install-binSCRIPTS \
+ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-libLTLIBRARIES \
install-library_includeHEADERS install-man install-strip \
installcheck installcheck-am installdirs installdirs-am \
maintainer-clean maintainer-clean-generic \
maintainer-clean-recursive mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-info-am \
+ uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-info-am \
uninstall-libLTLIBRARIES uninstall-library_includeHEADERS
@@ -1137,6 +1162,27 @@
dox:
cd docs && doxygen $(PWD)/docs/Doxygen.conf
+
+fsxs: fsxs.in
+ @echo creating fsxs
+ @sed -e "s, at MODULES_DIR\@,$(PREFIX)/mod," \
+ -e "s, at LIB_DIR\@,$(PREFIX)/lib," \
+ -e "s, at BIN_DIR\@,$(PREFIX)/bin," \
+ -e "s, at INC_DIR\@,$(PREFIX)/include," \
+ -e "s, at CFG_DIR\@,$(PREFIX)/conf," \
+ -e "s, at DB_DIR\@,$(PREFIX)/db," \
+ -e "s, at PREFIX\@,$(PREFIX)," \
+ -e "s, at CC\@,$(CC)," \
+ -e "s, at LD\@,$(CC)," \
+ -e "s, at INSTALL\@,$(INSTALL)," \
+ -e "s, at MKINSTALLDIRS\@,$(mkdir_p)," \
+ \
+ -e "s|@CFLAGS\@|$(CFLAGS) -fPIC $(shell $(APR_CONFIG) --cflags --cppflags)|" \
+ -e "s|@INCLUDES\@|-I$(PREFIX)/include $(shell $(APR_CONFIG) --includes) $(shell $(APU_CONFIG) --includes)|" \
+ -e "s|@SOLINK\@|$(SOLINK)|" \
+ -e "s|@LDFLAGS\@|-L$(PREFIX)/lib|" \
+ -e "s|@LIBS\@|-lfreeswitch|" \
+ fsxs.in > fsxs
eclean: clean
rm -f `find . -type f -name \*~`
Modified: freeswitch/branches/stkn/fsxs.in
==============================================================================
--- freeswitch/branches/stkn/fsxs.in (original)
+++ freeswitch/branches/stkn/fsxs.in Tue Jul 4 18:39:17 2006
@@ -12,45 +12,24 @@
my %vars = (
CC => '@CC@',
LD => '@LD@',
- MKDIR => '@MKINSTALLDIR@',
+ MKDIR => '@MKINSTALLDIRS@',
INSTALL => '@INSTALL@',
LIBS => '@LIBS@',
CFLAGS => '@CFLAGS@',
+ INCLUDES => '@INCLUDES@',
LDFLAGS => '@LDFLAGS@',
SOLINK => '@SOLINK@',
- APR_CFLAGS => '@APR_CFLAGS@',
- APR_LIBS => '@APR_LIBS@',
- MODULES_DIR => '@MODULES_DIR@'
+ MODULES_DIR => '@MODULES_DIR@',
LIB_DIR => '@LIB_DIR@',
BIN_DIR => '@BIN_DIR@',
+ INC_DIR => '@INC_DIR@',
DB_DIR => '@DB_DIR@',
CFG_DIR => '@CFG_DIR@',
PREFIX => '@PREFIX@'
);
-## example
-#my %vars = (
-# CC => 'gcc',
-# LD => 'gcc',
-# MKDIR => 'mkdir -p',
-# INSTALL => 'install',
-# LIBS => '-lfreeswitch',
-# CFLAGS => '-O2 -march=athlon-xp -pipe -ggdb3 -I/opt/freeswitch/include -I/opt/freeswitch/include/apr-1 -I/opt/freeswitch/include/apr-util-1',
-# LDFLAGS => '-L/opt/freeswitch/lib',
-# SOLINK => '-shared -Xlinker -x',
-# APR_CFLAGS => '-pthread -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE',
-# APR_LIBS => '',
#
-# MODULES_DIR => '/opt/freeswitch/mod',
-# LIB_DIR => '/opt/freeswitch/lib',
-# BIN_DIR => '/opt/freeswitch/bin',
-# DB_DIR => '/opt/freeswitch/db',
-# CFG_DIR => '/opt/freeswitch/conf',
-# PREFIX => '/opt/freeswitch'
-#);
-
-#
# Misc variables
#
my @files = ();
@@ -73,7 +52,7 @@
}
sub fsxs_usage {
- print "FreeSwitch fsxs\n(C) 2006 Stefan Knoblich <stkn at netdomination.org>\n";
+ print "FreeSwitch fsxs\n(C) 2006 Stefan Knoblich <stkn\@netdomination.org>\n";
print "\n";
print "Usage:\n";
print "\t$0 compile [options] <file1 ...>\n";
@@ -112,8 +91,8 @@
my $cc_cmd;
$cc_cmd = "$vars{CC}";
- if( defined( $vars{APR_CFLAGS} ) && $vars{APR_CFLAGS} ) {
- $cc_cmd = $cc_cmd . " $vars{APR_CFLAGS}"
+ if( defined( $vars{INCLUDES} ) && $vars{INCLUDES} ) {
+ $cc_cmd = $cc_cmd . " $vars{INCLUDES}"
}
$cc_cmd = $cc_cmd . " $vars{CFLAGS} -c -o";
@@ -138,9 +117,6 @@
my $ld_cmd;
$ld_cmd = "$vars{LD}";
- if( defined( $vars{APR_LIBS} ) && $vars{APR_LIBS} ) {
- $ld_cmd = $ld_cmd . " $vars{APR_LIBS}"
- }
$ld_cmd = $ld_cmd . " $vars{LDFLAGS} $vars{SOLINK} -o";
print "LD\t$target\t[@objs]\n";
More information about the Freeswitch-branches
mailing list