From d8d6a08d4677e6c68fc94b7d182e3af61c3fd76e Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Sat, 27 Jan 2018 11:12:44 +0100
Subject: bsps: Move network define to source files

Define __INSIDE_RTEMS_BSD_TCPIP_STACK__ in the network interface driver
source files to avoid some build system magic.
---
 c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am           | 11 ++---------
 c/src/lib/libbsp/powerpc/tqm8xx/network/network_fec.c |  3 +++
 c/src/lib/libbsp/powerpc/tqm8xx/network/network_scc.c |  3 +++
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'c/src/lib/libbsp/powerpc/tqm8xx')

diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
index 5531021385..9173d6b527 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
@@ -58,11 +58,8 @@ libbsp_a_SOURCES += ../../shared/bspclean.c \
 libbsp_a_SOURCES += ../../shared/bspreset.c
 
 if HAS_NETWORKING
-network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-noinst_PROGRAMS += network.rel
-network_rel_SOURCES = network/network_scc.c network/network_fec.c
-network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS)
-network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+libbsp_a_SOURCES += network/network_fec.c
+libbsp_a_SOURCES += network/network_scc.c
 endif
 
 libbsp_a_LIBADD = \
@@ -76,9 +73,5 @@ libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/mpc8xx/mmu.rel \
     ../../../libcpu/@RTEMS_CPU@/mpc8xx/timer.rel
 
-if HAS_NETWORKING
-libbsp_a_LIBADD += network.rel
-endif
-
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/powerpc/tqm8xx/headers.am
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/network/network_fec.c b/c/src/lib/libbsp/powerpc/tqm8xx/network/network_fec.c
index 11018ea632..71da617d8c 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/network/network_fec.c
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/network/network_fec.c
@@ -47,6 +47,9 @@
  *  and Charles-Antoine Gauthier <charles.gauthier@iit.nrc.ca>
  *  Copyright (c) 1999, National Research Council of Canada
  */
+
+#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+
 #include <bsp.h>
 #include <stdio.h>
 #include <errno.h>
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/network/network_scc.c b/c/src/lib/libbsp/powerpc/tqm8xx/network/network_scc.c
index 133dc0f4a2..98acbb3e7a 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/network/network_scc.c
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/network/network_scc.c
@@ -44,6 +44,9 @@
  *  and Charles-Antoine Gauthier <charles.gauthier@iit.nrc.ca>
  *  Copyright (c) 1999, National Research Council of Canada
  */
+
+#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+
 #include <bsp.h>
 #include <stdio.h>
 #include <errno.h>
-- 
cgit v1.2.3