[zaptel-commits] russell: trunk r1548 - in /trunk: ./ wct4xxp/
xpp/utils/
zaptel-commits at lists.digium.com
zaptel-commits at lists.digium.com
Wed Nov 1 12:10:56 MST 2006
Author: russell
Date: Wed Nov 1 13:10:56 2006
New Revision: 1548
URL: http://svn.digium.com/view/zaptel?rev=1548&view=rev
Log:
Merged revisions 1547 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
........
r1547 | russell | 2006-11-01 14:04:02 -0500 (Wed, 01 Nov 2006) | 3 lines
instead of setting HOSTCC and CC directly in the Makefile, use the information
provided by the configure script (issue #8055, tzafrir)
........
Modified:
trunk/ (props changed)
trunk/Makefile
trunk/configure
trunk/configure.ac
trunk/makeopts.in
trunk/wct4xxp/Makefile
trunk/xpp/utils/Makefile
Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Wed Nov 1 13:10:56 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547
Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=1548&r1=1547&r2=1548&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Nov 1 13:10:56 2006
@@ -9,8 +9,6 @@
.PHONY: menuselect distclean dist-clean clean version.h all _all install b410p devices programs modules linux24 linux26 xpp tests devel data stackcheck install-udev config update install-programs install-modules install-linux24 install-linux26 firmware install-include install-libs
-HOSTCC=gcc
-CC=gcc
PWD=$(shell pwd)
ifeq ($(DEB_HOST_GNU_TYPE),)
@@ -255,7 +253,8 @@
radfw.h: pciradio.rbt makefw
./makefw $< radfw > $@
-makefw: CFLAGS=
+makefw: makefw.c
+ $(HOSTCC) -o $@ $^
gendigits: LDLIBS+=-lm
gendigits: CFLAGS=
Modified: trunk/configure
URL: http://svn.digium.com/view/zaptel/trunk/configure?rev=1548&r1=1547&r2=1548&view=diff
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Wed Nov 1 13:10:56 2006
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac Revision: 1297 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60.
+# Generated by GNU Autoconf 2.60a.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -569,36 +569,36 @@
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
#else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
# include <stdlib.h>
# endif
#endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
# include <memory.h>
# endif
# include <string.h>
#endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
# include <inttypes.h>
#endif
-#if HAVE_STDINT_H
+#ifdef HAVE_STDINT_H
# include <stdint.h>
#endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif"
@@ -652,6 +652,7 @@
INSTALL_DATA
LN_S
GNU_MAKE
+HOSTCC
GREP
LN
EGREP
@@ -1320,7 +1321,7 @@
if $ac_init_version; then
cat <<\_ACEOF
configure
-generated by GNU Autoconf 2.60
+generated by GNU Autoconf 2.60a
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1336,7 +1337,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+generated by GNU Autoconf 2.60a. Invocation command line was
$ $0 $@
@@ -2111,7 +2112,7 @@
# in a Makefile. We should not override ac_cv_exeext if it was cached,
# so that the user can short-circuit this test for compilers unknown to
# Autoconf.
-for ac_file in $ac_files
+for ac_file in $ac_files ''
do
test -f "$ac_file" || continue
case $ac_file in
@@ -2139,6 +2140,12 @@
test "$ac_cv_exeext" = no && ac_cv_exeext=
else
+ ac_file=''
+fi
+
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+if test -z "$ac_file"; then
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -2150,8 +2157,6 @@
fi
ac_exeext=$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
@@ -3111,6 +3116,10 @@
{ (exit 1); exit 1; }; }
fi
+
+
+# Set the default value of HOSTCC from CC if --host was not provided:
+HOSTCC=${HOSTCC:=${CC}}
# Extract the first word of "grep", so it can be a program name with args.
@@ -3784,7 +3793,7 @@
ac_cv_lib_curses_initscr=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -4264,7 +4273,7 @@
ac_cv_lib_ncurses_initscr=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -4744,7 +4753,7 @@
ac_cv_lib_newt_newtBell=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -5542,7 +5551,7 @@
# values after options handling.
ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+generated by GNU Autoconf 2.60a. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -5569,7 +5578,7 @@
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
- -V, --version print version number, then exit
+ -V, --version print version number and configuration settings, then exit
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
@@ -5585,7 +5594,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.60,
+configured by $0, generated by GNU Autoconf 2.60a,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Copyright (C) 2006 Free Software Foundation, Inc.
@@ -5795,6 +5804,7 @@
INSTALL_DATA!$INSTALL_DATA$ac_delim
LN_S!$LN_S$ac_delim
GNU_MAKE!$GNU_MAKE$ac_delim
+HOSTCC!$HOSTCC$ac_delim
GREP!$GREP$ac_delim
LN!$LN$ac_delim
EGREP!$EGREP$ac_delim
@@ -5811,7 +5821,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 65; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Modified: trunk/configure.ac
URL: http://svn.digium.com/view/zaptel/trunk/configure.ac?rev=1548&r1=1547&r2=1548&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Wed Nov 1 13:10:56 2006
@@ -36,6 +36,10 @@
AC_PROG_LN_S
AST_CHECK_GNU_MAKE
+# Set the default value of HOSTCC from CC if --host was not provided:
+HOSTCC=${HOSTCC:=${CC}}
+AC_SUBST(HOSTCC)
+
AC_PATH_PROG([GREP], [grep], :)
AC_PATH_PROG([SHELL], [sh], :)
AC_PATH_PROG([LN], [ln], :)
Modified: trunk/makeopts.in
URL: http://svn.digium.com/view/zaptel/trunk/makeopts.in?rev=1548&r1=1547&r2=1548&view=diff
==============================================================================
--- trunk/makeopts.in (original)
+++ trunk/makeopts.in Wed Nov 1 13:10:56 2006
@@ -1,5 +1,5 @@
CC=@CC@
-HOST_CC=@CC@
+HOSTCC=@HOSTCC@
INSTALL=@INSTALL@
GREP=@GREP@
Modified: trunk/wct4xxp/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/wct4xxp/Makefile?rev=1548&r1=1547&r2=1548&view=diff
==============================================================================
--- trunk/wct4xxp/Makefile (original)
+++ trunk/wct4xxp/Makefile Wed Nov 1 13:10:56 2006
@@ -19,7 +19,8 @@
wct4xxp.o: base.o vpm450m.o $(OCTASIC_OBJS)
$(LD) -r -o $@ $^
-fw2h: CFLAGS=
+fw2h: fw2h.c
+ $(HOSTCC) -o $@ $^
vpm450m_fw.h: OCT6114-128D.ima fw2h
./fw2h $< $@
Modified: trunk/xpp/utils/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/xpp/utils/Makefile?rev=1548&r1=1547&r2=1548&view=diff
==============================================================================
--- trunk/xpp/utils/Makefile (original)
+++ trunk/xpp/utils/Makefile Wed Nov 1 13:10:56 2006
@@ -48,7 +48,8 @@
test_parse: test_parse.o libhexfile.a
$(CC) -L. -o $@ $@.o $(EXTRA_LIBS) -lhexfile -lusb
-print_modes.o: wctdm_fxomodes.h
+print_modes.o: print_modes.c wctdm_fxomodes.h
+ $(HOSTCC) $(CFLAGS) -c $^
wctdm_fxomodes.h: $(WCTDM)
perl -n -e 'print if (/^static struct fxo_mode {$$/ .. /};$$/)' $(WCTDM) >$@
More information about the zaptel-commits
mailing list