Commit 943e1353 authored by Karl Heyes's avatar Karl Heyes

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

svn path=/trunk/avl/; revision=4439
parent 49b078cc
......@@ -42,23 +42,9 @@ if test -z "$GCC"; then
;;
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 @@ if test "$enable_pthread" != "no"
then
ACX_PTHREAD([
LIBS="$LIBS $PTHREAD_LIBS"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
XIPH_CFLAGS="$XIPH_CFLAGS $PTHREAD_CFLAGS"
CC="$PTHREAD_CC"
have_thread="yes"
])
......
......@@ -6,5 +6,6 @@ noinst_PROGRAMS = example
example_SOURCES = example.c
example_LDADD = ../src/libshout.la $(OGG_LIBS) $(VORBIS_LIBS)
AM_CFLAGS = @XIPH_CFLAGS@
INCLUDES = -I$(top_srcdir)/include
......@@ -13,6 +13,7 @@ libshout_la_LDFLAGS = -version-info 3:0:0
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)
......
......@@ -6,6 +6,7 @@ noinst_LTLIBRARIES = libiceavl.la
noinst_HEADERS = avl.h
libiceavl_la_SOURCES = avl.c
libiceavl_la_CFLAGS = @XIPH_CFLAGS@
INCLUDES = -I$(srcdir)/../thread
......@@ -13,8 +14,8 @@ INCLUDES = -I$(srcdir)/../thread
GET = true
debug:
$(MAKE) all CFLAGS="@DEBUG@"
$(MAKE) all CFLAGS="@DEBUG@"
profile:
$(MAKE) all CFLAGS="@PROFILE@"
$(MAKE) all CFLAGS="@PROFILE@"
......@@ -6,6 +6,7 @@ noinst_LTLIBRARIES = libicehttpp.la
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 @@ INCLUDES = -I$(srcdir)/../avl -I$(srcdir)/../thread
GET = true
debug:
$(MAKE) all CFLAGS="@DEBUG@"
$(MAKE) all CFLAGS="@DEBUG@"
profile:
$(MAKE) all CFLAGS="@PROFILE@"
$(MAKE) all CFLAGS="@PROFILE@"
......@@ -6,12 +6,13 @@ noinst_LTLIBRARIES = libicenet.la
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@
......@@ -6,6 +6,7 @@ noinst_LTLIBRARIES = libicethread.la
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 @@ INCLUDES = -I$(srcdir)/../avl -I$(srcdir)/../log
GET = true
debug:
$(MAKE) all CFLAGS="@DEBUG@"
$(MAKE) all CFLAGS="@DEBUG@"
profile:
$(MAKE) all CFLAGS="@PROFILE@"
$(MAKE) all CFLAGS="@PROFILE@"
......@@ -6,13 +6,14 @@ noinst_LTLIBRARIES = libicetiming.la
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@"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment