[xiph-cvs] cvs commit: timing Makefile.am
Karl Heyes
karl at xiph.org
Fri Mar 7 16:46:59 PST 2003
karl 03/03/07 19:46:59
Modified: . configure.in
examples Makefile.am
src Makefile.am
. Makefile.am
. Makefile.am
. Makefile.am
. Makefile.am
. Makefile.am
Log:
more on the XIPH_CFLAGS. For the smaller libs like thread etc put any
passed flags into the compiling rules. Also configure in libshout now
sets up the XIPH_CFLAGS
Revision Changes Path
1.17 +4 -18 libshout/configure.in
Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/libshout/configure.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- configure.in 7 Mar 2003 22:39:17 -0000 1.16
+++ configure.in 8 Mar 2003 00:46:58 -0000 1.17
@@ -42,23 +42,9 @@
;;
esac
else
- case $host in
- *-*-linux*)
- DEBUG="-g -Wall -fsigned-char -D_REENTRANT -D_GNU_SOURCE"
- CFLAGS="-Wall -O2 -ffast-math -fsigned-char -D_REENTRANT -D_GNU_SOURCE"
- PROFILE="-Wall -pg -g -O2 -ffast-math -fsigned-char -D_REENTRANT -D_GNU_SOURCE"
- ;;
- sparc-sun-*)
- DEBUG="-g -Wall -fsigned-char -mv8"
- CFLAGS="-O20 -ffast-math -fsigned-char -mv8"
- PROFILE="-pg -g -O20 -fsigned-char -mv8"
- ;;
- *)
- DEBUG="-g -Wall -fsigned-char"
- CFLAGS="-O20 -fsigned-char"
- PROFILE="-O20 -g -pg -fsigned-char"
- ;;
- esac
+ XIPH_CFLAGS="-Wall -ffast-math -fsigned-char -D_GNU_SOURCE"
+ DEBUG="-g"
+ PROFILE="-pg -g"
fi
dnl Checks for programs.
@@ -112,7 +98,7 @@
then
ACX_PTHREAD([
LIBS="$LIBS $PTHREAD_LIBS"
- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ XIPH_CFLAGS="$XIPH_CFLAGS $PTHREAD_CFLAGS"
CC="$PTHREAD_CC"
have_thread="yes"
])
<p><p>1.4 +1 -0 libshout/examples/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/libshout/examples/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am 6 Mar 2003 01:55:20 -0000 1.3
+++ Makefile.am 8 Mar 2003 00:46:58 -0000 1.4
@@ -6,5 +6,6 @@
example_SOURCES = example.c
example_LDADD = ../src/libshout.la $(OGG_LIBS) $(VORBIS_LIBS)
+AM_CFLAGS = @XIPH_CFLAGS@
INCLUDES = -I$(top_srcdir)/include
<p><p>1.8 +1 -0 libshout/src/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/libshout/src/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.am 6 Mar 2003 01:55:20 -0000 1.7
+++ Makefile.am 8 Mar 2003 00:46:58 -0000 1.8
@@ -13,6 +13,7 @@
noinst_HEADERS = shout_private.h util.h
libshout_la_SOURCES = shout.c util.c vorbis.c mp3.c
+AM_CFLAGS = @XIPH_CFLAGS@
libshout_la_LIBADD = net/libicenet.la timing/libicetiming.la avl/libiceavl.la\
httpp/libicehttpp.la $(MAYBE_THREAD_LIB) $(VORBIS_LIBS) $(OGG_LIBS)
<p><p>1.2 +3 -2 avl/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/avl/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am 10 Sep 2001 02:28:01 -0000 1.1
+++ Makefile.am 8 Mar 2003 00:46:58 -0000 1.2
@@ -6,6 +6,7 @@
noinst_HEADERS = avl.h
libiceavl_la_SOURCES = avl.c
+libiceavl_la_CFLAGS = @XIPH_CFLAGS@
INCLUDES = -I$(srcdir)/../thread
@@ -13,8 +14,8 @@
GET = true
debug:
- $(MAKE) all CFLAGS="@DEBUG@"
+ $(MAKE) all CFLAGS="@DEBUG@"
profile:
- $(MAKE) all CFLAGS="@PROFILE@"
+ $(MAKE) all CFLAGS="@PROFILE@"
<p><p>1.2 +3 -2 httpp/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/httpp/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am 10 Sep 2001 02:28:47 -0000 1.1
+++ Makefile.am 8 Mar 2003 00:46:58 -0000 1.2
@@ -6,6 +6,7 @@
noinst_HEADERS = httpp.h
libicehttpp_la_SOURCES = httpp.c
+libicehttpp_la_CFLAGS = @XIPH_CFLAGS@
INCLUDES = -I$(srcdir)/../avl -I$(srcdir)/../thread
@@ -13,8 +14,8 @@
GET = true
debug:
- $(MAKE) all CFLAGS="@DEBUG@"
+ $(MAKE) all CFLAGS="@DEBUG@"
profile:
- $(MAKE) all CFLAGS="@PROFILE@"
+ $(MAKE) all CFLAGS="@PROFILE@"
<p><p>1.3 +3 -2 net/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/net/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am 6 Mar 2003 05:56:03 -0000 1.2
+++ Makefile.am 8 Mar 2003 00:46:58 -0000 1.3
@@ -6,12 +6,13 @@
noinst_HEADERS = resolver.h sock.h
libicenet_la_SOURCES = sock.c resolver.c
+libicenet_la_CFLAGS = @XIPH_CFLAGS@
INCLUDES = -I$(srcdir)/../thread
debug:
- $(MAKE) all CFLAGS="@DEBUG@"
+ $(MAKE) all CFLAGS="@DEBUG@"
profile:
- $(MAKE) all CFLAGS="@PROFILE@"
+ $(MAKE) all CFLAGS="@PROFILE@
<p><p>1.2 +3 -2 thread/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/thread/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am 10 Sep 2001 02:26:32 -0000 1.1
+++ Makefile.am 8 Mar 2003 00:46:58 -0000 1.2
@@ -6,6 +6,7 @@
noinst_HEADERS = thread.h
libicethread_la_SOURCES = thread.c
+libicethread_la_CFLAGS = @XIPH_CFLAGS@
INCLUDES = -I$(srcdir)/../avl -I$(srcdir)/../log
@@ -13,8 +14,8 @@
GET = true
debug:
- $(MAKE) all CFLAGS="@DEBUG@"
+ $(MAKE) all CFLAGS="@DEBUG@"
profile:
- $(MAKE) all CFLAGS="@PROFILE@"
+ $(MAKE) all CFLAGS="@PROFILE@"
<p><p>1.2 +3 -2 timing/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/timing/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am 10 Sep 2001 02:29:36 -0000 1.1
+++ Makefile.am 8 Mar 2003 00:46:59 -0000 1.2
@@ -6,13 +6,14 @@
noinst_HEADERS = timing.h
libicetiming_la_SOURCES = timing.c
+libicetiming_la_CFLAGS = @XIPH_CFLAGS@
# SCCS stuff (for BitKeeper)
GET = true
debug:
- $(MAKE) all CFLAGS="@DEBUG@"
+ $(MAKE) all CFLAGS="@DEBUG@"
profile:
- $(MAKE) all CFLAGS="@PROFILE@"
+ $(MAKE) all CFLAGS="@PROFILE@"
<p><p>--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list