- use GST_CFLAGS/LIBSBRANCH-BUILD1-200112061-FREEZE

Original commit message from CVS:
- use GST_CFLAGS/LIBS
- ac/am fixes

6 files changed, 15 insertions, 8 deletions

diff --git a/libs/bytestream/Makefile.am b/libs/bytestream/Makefile.am
index 0a6e8ee9cf..5853dc3924 100644
--- a/libs/bytestream/Makefile.am
+++ b/libs/bytestream/Makefile.am
@@ -8,4 +8,8 @@ libgstbstest_la_SOURCES = gstbstest.c
 libgstbytestreamincludedir = $(includedir)/gst/libs/bytestream
 libgstbytestreaminclude_HEADERS = gstbytestream.h
 
-# CFLAGS += -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math
+libgstbytestream_la_LIBADD = $(GST_LIBS)
+libgstbytestream_la_CFLAGS = $(GST_CFLAGS)
+
+libgstbstest_la_LIBADD = $(GST_LIBS)
+libgstbstest_la_CFLAGS = $(GST_CFLAGS)
diff --git a/libs/control/Makefile.am b/libs/control/Makefile.am
index bb721257f1..da7a41ee47 100644
--- a/libs/control/Makefile.am
+++ b/libs/control/Makefile.am
@@ -16,6 +16,5 @@ libgstcontrolinclude_HEADERS = \
     gstdparam.h \
     gstdplinearinterp.h
 
-libgstcontrol_la_LIBADD = -lm
-
-CFLAGS += -O2 $(FOMIT_FRAME_POINTER) -finline-functions -ffast-math
+libgstcontrol_la_LIBADD = $(GST_LIBS)
+libgstcontrol_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math
diff --git a/libs/getbits/Makefile.am b/libs/getbits/Makefile.am
index f9f4699549..1149f2d513 100644
--- a/libs/getbits/Makefile.am
+++ b/libs/getbits/Makefile.am
@@ -21,4 +21,5 @@ check_PROGRAMS = gbtest
 gbtest_SOURCES = gbtest.c
 gbtest_LDADD = libgstgetbits.la $(GST_LIBS)
 
-CFLAGS += -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math
+libgstgetbits_la_LIBADD = $(GST_LIBS)
+libgstgetbits_la_CFLAGS = $(GST_CFLAGS) -funroll-all-loops -finline-functions -ffast-math
diff --git a/libs/idct/Makefile.am b/libs/idct/Makefile.am
index ba53d49080..3fe43a18ef 100644
--- a/libs/idct/Makefile.am
+++ b/libs/idct/Makefile.am
@@ -27,4 +27,5 @@ ieeetest_LDFLAGS = $(GNOME_LIBS) $(GST_LIBS)
 
 noinst_HEADERS = dct.h
 
-CFLAGS += -O2 $(FOMIT_FRAME_POINTER) -finline-functions -ffast-math
+libgstidct_la_LIBADD = $(GST_LIBS)
+libgstidct_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math
diff --git a/libs/putbits/Makefile.am b/libs/putbits/Makefile.am
index 727a1764bb..4e75d978be 100644
--- a/libs/putbits/Makefile.am
+++ b/libs/putbits/Makefile.am
@@ -9,4 +9,5 @@ libgstputbitsinclude_HEADERS = gstputbits.h
 
 noinst_HEADERS = gstputbits.h 
 
-CFLAGS += -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math
+libgstputbits_la_LIBADD = $(GST_LIBS)
+libgstputbits_la_CFLAGS = $(GST_CFLAGS) -funroll-all-loops -finline-functions -ffast-math
diff --git a/libs/resample/Makefile.am b/libs/resample/Makefile.am
index 504e9680d6..b4f88d1aa8 100644
--- a/libs/resample/Makefile.am
+++ b/libs/resample/Makefile.am
@@ -25,5 +25,6 @@ ARCHCFLAGS =
 endif
 endif
 
-CFLAGS += -O2 -ffast-math $(ARCHCFLAGS)
+libresample_la_LIBADD = $(GST_LIBS)
+libresample_la_CFLAGS = $(GST_CFLAGS) -ffast-math $(ARCHCFLAGS)