From 6c48c76ab601dd1f608e716bc598e16794b42789 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
Date: Wed, 24 Feb 2016 08:03:54 +0100
Subject: [PATCH 07/10] Eliminate CFLAGS.
---
alliance/src/druc/src/Makefile.am | 5 ++---
alliance/src/m2e/src/Makefile.am | 2 +-
alliance/src/nero/src/Makefile.am | 3 ---
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/alliance/src/druc/src/Makefile.am b/alliance/src/druc/src/Makefile.am
index 16ecb34..bb31154 100644
--- a/alliance/src/druc/src/Makefile.am
+++ b/alliance/src/druc/src/Makefile.am
@@ -8,7 +8,8 @@ drucompi.h drucring.c drucring.h drucutil.c drucutil.h vmcaract.c vmcaract.h \
vmcasmld.c vmcasmld.h vmcerror.c vmcerror.h vmcmesur.c vmcmesur.h vmcrelat.c \
vmcrelat.h vmctools.c vmctools.h vmcunify.c vmcunify.h
-CFLAGS = $(ALLIANCE_CFLAGS) -g -O0
+AM_CFLAGS = $(ALLIANCE_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/mbk/src -I$(top_srcdir)/rds/src
libVrd_la_LDFLAGS = -version-info @VRD_DLL_VERSION@
libVrd_la_LIBADD = -lRds -lMut
@@ -22,8 +23,6 @@ drucompi_l.c : $(srcdir)/drucompi_l.l drucompi_y.h
bin_PROGRAMS = druc
-AM_CFLAGS = -I$(top_srcdir)/mbk/src -I$(top_srcdir)/rds/src
-
druc_LDADD = $(ALLIANCE_LIBS) -L. libVrd.la \
-L$(builddir)/../../rds/src/.libs -lRds \
-L$(builddir)/../../mbk/src/.libs -lMpu -lMut
diff --git a/alliance/src/m2e/src/Makefile.am b/alliance/src/m2e/src/Makefile.am
index 969bc1a..04a817b 100644
--- a/alliance/src/m2e/src/Makefile.am
+++ b/alliance/src/m2e/src/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-AM_CFLAGS = -g -I$(top_srcdir)/mbk/src
+AM_CFLAGS = -I$(top_srcdir)/mbk/src
bin_PROGRAMS = m2e
diff --git a/alliance/src/nero/src/Makefile.am b/alliance/src/nero/src/Makefile.am
index 71e2810..f3a5abd 100644
--- a/alliance/src/nero/src/Makefile.am
+++ b/alliance/src/nero/src/Makefile.am
@@ -1,8 +1,5 @@
## Process this file with automake to produce Makefile.in
-#CXXFLAGS = -g -pg -O2
-CXXFLAGS = -g -O2
-#CXXFLAGS = -O2
AM_CXXFLAGS = @ALLIANCE_CFLAGS@ \
-I$(top_srcdir)/abl/src \
-I$(top_srcdir)/aut/src \
--
2.5.0