From d4d144032c0a29fb770b2109d8edfc050185a74c Mon Sep 17 00:00:00 2001 From: Wrobell Date: Sun, 16 Dec 2001 18:49:35 +0000 Subject: [PATCH] - use GST_CFLAGS only Original commit message from CVS: - use GST_CFLAGS only - use AM_CFLAGS instead of CFLAGS so user cflags are not overwritten - use LDADD instead of LIBS (by analogy for _LDADD, look for example in tools/Makefile.am) - kill me if it is wrong --- tests/Makefile.am | 5 ++--- tests/eos/Makefile.am | 5 ++--- tests/muxing/Makefile.am | 5 ++--- tests/nego/Makefile.am | 5 ++--- tests/sched/Makefile.am | 5 ++--- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 9eeeb6f223..df087333a2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -12,8 +12,7 @@ paranoia rip mp3encode case4 markup load autoplug3 \ incsched reaping threadlock mp1vid reconnect \ faketest events timecache -# we have nothing but apps here, we can do this safely -LIBS = $(GST_LIBS) -CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS) +LDADD = $(GST_LIBS) +AM_CFLAGS = $(GST_CFLAGS) EXTRA_DIST = README diff --git a/tests/eos/Makefile.am b/tests/eos/Makefile.am index aa55a8fcd5..0830600da4 100644 --- a/tests/eos/Makefile.am +++ b/tests/eos/Makefile.am @@ -1,5 +1,4 @@ noinst_PROGRAMS = case1 case2 case3 case4 case5 case6 case7 -# jsut apps here, this is safe -LIBS = $(GST_LIBS) -CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS) +LDADD = $(GST_LIBS) +AM_CFLAGS = $(GST_CFLAGS) diff --git a/tests/muxing/Makefile.am b/tests/muxing/Makefile.am index 447ed2f940..ea7508474c 100644 --- a/tests/muxing/Makefile.am +++ b/tests/muxing/Makefile.am @@ -1,5 +1,4 @@ noinst_PROGRAMS = case1 -# jsut apps here, this is safe -LIBS = $(GST_LIBS) -CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS) +LDADD = $(GST_LIBS) +AM_CFLAGS = $(GST_CFLAGS) diff --git a/tests/nego/Makefile.am b/tests/nego/Makefile.am index 7e47fff9b6..320efb2806 100644 --- a/tests/nego/Makefile.am +++ b/tests/nego/Makefile.am @@ -1,5 +1,4 @@ noinst_PROGRAMS = nego1 -# jsut apps here, this is safe -LIBS = $(GST_LIBS) -CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS) +LDADD = $(GST_LIBS) +AM_CFLAGS = $(GST_CFLAGS) diff --git a/tests/sched/Makefile.am b/tests/sched/Makefile.am index 8f1fa53d6a..d1479cfedd 100644 --- a/tests/sched/Makefile.am +++ b/tests/sched/Makefile.am @@ -6,6 +6,5 @@ endif dynamic_pipeline_SOURCES = dynamic-pipeline.c -# nothing but apps here, this is safe -LIBS = $(GST_LIBS) -CFLAGS = $(GLIB_CFLAGS) $(XML_CFLAGS) $(GST_CFLAGS) +LDADD = $(GST_LIBS) +AM_CFLAGS = $(GST_CFLAGS)