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/i386/pc386/3c509/3c509.c   |  2 ++
 c/src/lib/libbsp/i386/pc386/3c509/elink.c   |  2 ++
 c/src/lib/libbsp/i386/pc386/Makefile.am     | 42 +++++------------------------
 c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c |  2 ++
 c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c |  2 ++
 5 files changed, 14 insertions(+), 36 deletions(-)

(limited to 'c/src/lib/libbsp/i386/pc386')

diff --git a/c/src/lib/libbsp/i386/pc386/3c509/3c509.c b/c/src/lib/libbsp/i386/pc386/3c509/3c509.c
index 41c1de1572..3cf7ec5226 100644
--- a/c/src/lib/libbsp/i386/pc386/3c509/3c509.c
+++ b/c/src/lib/libbsp/i386/pc386/3c509/3c509.c
@@ -53,6 +53,8 @@
  * eric@skatter.usask.ca
  */
 
+#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+
 #include <bsp.h>
 
 #include <stdio.h>
diff --git a/c/src/lib/libbsp/i386/pc386/3c509/elink.c b/c/src/lib/libbsp/i386/pc386/3c509/elink.c
index 2132ad29ba..ca637fb0a8 100644
--- a/c/src/lib/libbsp/i386/pc386/3c509/elink.c
+++ b/c/src/lib/libbsp/i386/pc386/3c509/elink.c
@@ -31,6 +31,8 @@
  * Common code for dealing with 3COM ethernet cards.
  */
 
+#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+
 #include <sys/types.h>
 
 #include "elink.h"
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am
index 0fc36a6cb9..157d7a6017 100644
--- a/c/src/lib/libbsp/i386/pc386/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/Makefile.am
@@ -162,34 +162,12 @@ appstart.$(OBJEXT): appcpustart.$(OBJEXT)
 endif
 
 if HAS_NETWORKING
-ne2000_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-noinst_PROGRAMS += ne2000.rel
-ne2000_rel_SOURCES = ne2000/ne2000.c
-ne2000_rel_CPPFLAGS = $(AM_CPPFLAGS) $(ne2000_CPPFLAGS)
-ne2000_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-ne2000_rel_LDFLAGS += -Wl,--undefined=rtems_ne_driver_attach
-endif
-
-if HAS_NETWORKING
-wd8003_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-noinst_PROGRAMS += wd8003.rel
-wd8003_rel_SOURCES = wd8003/wd8003.c
-wd8003_rel_CPPFLAGS = $(AM_CPPFLAGS) $(wd8003_CPPFLAGS)
-wd8003_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-wd8003_rel_LDFLAGS += -Wl,--undefined=rtems_wd_driver_attach
-endif
-
-if HAS_NETWORKING
-3c509_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-noinst_PROGRAMS += 3c509.rel
-3c509_rel_SOURCES = 3c509/3c509.c
-3c509_rel_SOURCES += 3c509/3c509.h
-3c509_rel_SOURCES += 3c509/elink.c
-3c509_rel_SOURCES += 3c509/elink.h
-3c509_rel_CPPFLAGS = $(AM_CPPFLAGS) $(3c509_CPPFLAGS)
-3c509_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-3c509_rel_LDFLAGS += -Wl,--undefined=rtems_3c509_driver_attach
-3c509_rel_LDFLAGS += -Wl,--undefined=ep_board
+libbsp_a_SOURCES += 3c509/3c509.c
+libbsp_a_SOURCES += 3c509/3c509.h
+libbsp_a_SOURCES += 3c509/elink.c
+libbsp_a_SOURCES += 3c509/elink.h
+libbsp_a_SOURCES += ne2000/ne2000.c
+libbsp_a_SOURCES += wd8003/wd8003.c
 endif
 
 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/cache.rel
@@ -200,14 +178,6 @@ if HAS_SMP
 libbsp_a_LIBADD += appstart.$(OBJEXT)
 endif
 
-# We only build the Network library if HAS_NETWORKING was defined
-# dec21140 is supported via libchip
-if HAS_NETWORKING
-libbsp_a_LIBADD += ne2000.rel
-libbsp_a_LIBADD += wd8003.rel
-libbsp_a_LIBADD += 3c509.rel
-endif
-
 EXTRA_DIST += HOWTO
 EXTRA_DIST += README.dec21140
 EXTRA_DIST += STATUS
diff --git a/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c b/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c
index 0b9bdba7ee..17861405a6 100644
--- a/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c
+++ b/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c
@@ -27,6 +27,8 @@
  *  that.
  */
 
+#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+
 #include <bsp.h>
 #include <libchip/wd80x3.h>
 
diff --git a/c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c b/c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c
index 1d37f38377..d10361bf2c 100644
--- a/c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c
+++ b/c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c
@@ -9,6 +9,8 @@
  *    eric@skatter.usask.ca
  */
 
+#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+
 #include <bsp.h>
 #include <libchip/wd80x3.h>
 
-- 
cgit v1.2.3