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.

10 files changed, 21 insertions, 69 deletions

diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am
index cf499de0d5..cb7ee0a34e 100644
--- a/c/src/lib/libbsp/sparc/erc32/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am
@@ -73,11 +73,7 @@ libbsp_a_SOURCES += ../../shared/bspsmpgetcurrentprocessor.c
 endif
 
 if HAS_NETWORKING
-erc32sonic_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-noinst_PROGRAMS += erc32sonic.rel
-erc32sonic_rel_SOURCES = erc32sonic/erc32sonic.c
-erc32sonic_rel_CPPFLAGS = $(AM_CPPFLAGS) $(erc32sonic_CPPFLAGS)
-erc32sonic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+libbsp_a_SOURCES += erc32sonic/erc32sonic.c
 endif
 
 libbsp_a_LIBADD  = \
@@ -85,9 +81,6 @@ libbsp_a_LIBADD  = \
     ../../../libcpu/@RTEMS_CPU@/cache.rel \
     ../../../libcpu/@RTEMS_CPU@/reg_win.rel \
     ../../../libcpu/@RTEMS_CPU@/syscall.rel
-if HAS_NETWORKING
-libbsp_a_LIBADD += erc32sonic.rel
-endif
 
 EXTRA_DIST += times
 
diff --git a/c/src/lib/libbsp/sparc/erc32/erc32sonic/erc32sonic.c b/c/src/lib/libbsp/sparc/erc32/erc32sonic/erc32sonic.c
index f7d7b61f5d..ce108bd825 100644
--- a/c/src/lib/libbsp/sparc/erc32/erc32sonic/erc32sonic.c
+++ b/c/src/lib/libbsp/sparc/erc32/erc32sonic/erc32sonic.c
@@ -20,6 +20,8 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+
 #include <bsp.h>
 #include <libchip/sonic.h>
 #if (SONIC_DEBUG & SONIC_DEBUG_PRINT_REGISTERS)
diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am
index 1914c6956f..f7f2fd6937 100644
--- a/c/src/lib/libbsp/sparc/leon2/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am
@@ -169,29 +169,9 @@ libbsp_a_SOURCES += ../../shared/bspsmpgetcurrentprocessor.c
 endif
 
 if HAS_NETWORKING
-noinst_PROGRAMS += leon_smc91111.rel
-leon_smc91111_rel_SOURCES = leon_smc91111/leon_smc91111.c
-leon_smc91111_rel_CPPFLAGS = $(AM_CPPFLAGS)
-leon_smc91111_rel_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-leon_smc91111_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-
-if HAS_NETWORKING
-noinst_PROGRAMS += leon_open_eth.rel
-leon_open_eth_rel_SOURCES = leon_open_eth/leon_open_eth.c
-leon_open_eth_rel_CPPFLAGS = $(AM_CPPFLAGS)
-leon_open_eth_rel_CPPFLAGS +=  -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-leon_open_eth_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-
-if HAS_NETWORKING
-noinst_PROGRAMS += leon_greth.rel
-leon_greth_rel_SOURCES = ../../sparc/shared/net/greth.c
-leon_greth_rel_CPPFLAGS = $(AM_CPPFLAGS)
-leon_greth_rel_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-leon_greth_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-# BSP Network configuration
+libbsp_a_SOURCES += leon_smc91111/leon_smc91111.c
+libbsp_a_SOURCES += leon_open_eth/leon_open_eth.c
+libbsp_a_SOURCES += ../../sparc/shared/net/greth.c
 libbsp_a_SOURCES += ../../sparc/shared/net/network_interface_add.c
 endif
 
@@ -201,12 +181,6 @@ libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/reg_win.rel \
     ../../../libcpu/@RTEMS_CPU@/syscall.rel
 
-if HAS_NETWORKING
-libbsp_a_LIBADD += leon_greth.rel
-libbsp_a_LIBADD += leon_open_eth.rel
-libbsp_a_LIBADD += leon_smc91111.rel
-endif
-
 EXTRA_DIST += times
 
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sparc/leon2/leon_open_eth/leon_open_eth.c b/c/src/lib/libbsp/sparc/leon2/leon_open_eth/leon_open_eth.c
index ae0e8052f7..27b04cd386 100644
--- a/c/src/lib/libbsp/sparc/leon2/leon_open_eth/leon_open_eth.c
+++ b/c/src/lib/libbsp/sparc/leon2/leon_open_eth/leon_open_eth.c
@@ -13,6 +13,8 @@
  * http://www.rtems.org/license/LICENSE.
  */
 
+#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+
 #include <bsp.h>
 #include <libchip/open_eth.h>
 #if (OPEN_ETH_DEBUG & OPEN_ETH_DEBUG_PRINT_REGISTERS)
diff --git a/c/src/lib/libbsp/sparc/leon2/leon_smc91111/leon_smc91111.c b/c/src/lib/libbsp/sparc/leon2/leon_smc91111/leon_smc91111.c
index 45b9a4aab7..748ca35491 100644
--- a/c/src/lib/libbsp/sparc/leon2/leon_smc91111/leon_smc91111.c
+++ b/c/src/lib/libbsp/sparc/leon2/leon_smc91111/leon_smc91111.c
@@ -13,6 +13,8 @@
  * http://www.rtems.org/license/LICENSE.
  */
 
+#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+
 #include <rtems.h>
 
 #include <bsp.h>
diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am
index 60e2a9044a..2f8480ae97 100644
--- a/c/src/lib/libbsp/sparc/leon3/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am
@@ -189,35 +189,13 @@ libbsp_a_SOURCES += startup/bspsmp.c
 endif
 
 if HAS_NETWORKING
-noinst_PROGRAMS += leon_smc91111.rel
-leon_smc91111_rel_SOURCES = leon_smc91111/leon_smc91111.c
-leon_smc91111_rel_CPPFLAGS = $(AM_CPPFLAGS)
-leon_smc91111_rel_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-leon_smc91111_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-
-if HAS_NETWORKING
-noinst_PROGRAMS += leon_open_eth.rel
-leon_open_eth_rel_SOURCES = leon_open_eth/leon_open_eth.c
-leon_open_eth_rel_CPPFLAGS = $(AM_CPPFLAGS)
-leon_open_eth_rel_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-leon_open_eth_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-
-if HAS_NETWORKING
-noinst_PROGRAMS += leon_greth.rel
+libbsp_a_SOURCES += leon_smc91111/leon_smc91111.c
+libbsp_a_SOURCES += leon_open_eth/leon_open_eth.c
+libbsp_a_SOURCES += ../../sparc/shared/net/greth.c
+libbsp_a_SOURCES += ../../sparc/shared/net/network_interface_add.c
 if !HAS_SMP
 libbsp_a_SOURCES += leon_greth/leon_greth.c
 endif
-leon_greth_rel_SOURCES = ../../sparc/shared/net/greth.c
-leon_greth_rel_CPPFLAGS = $(AM_CPPFLAGS)
-leon_greth_rel_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
-leon_greth_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-
-# BSP Network configuration
-if HAS_NETWORKING
-libbsp_a_SOURCES += ../../sparc/shared/net/network_interface_add.c
 endif
 
 EXTRA_DIST += shmsupp/README
@@ -232,12 +210,6 @@ libbsp_a_LIBADD = \
     ../../../libcpu/@RTEMS_CPU@/reg_win.rel \
     ../../../libcpu/@RTEMS_CPU@/syscall.rel
 
-if HAS_NETWORKING
-libbsp_a_LIBADD += leon_open_eth.rel
-libbsp_a_LIBADD += leon_greth.rel
-libbsp_a_LIBADD += leon_smc91111.rel
-endif
-
 EXTRA_DIST += times
 
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sparc/leon3/leon_greth/leon_greth.c b/c/src/lib/libbsp/sparc/leon3/leon_greth/leon_greth.c
index 77e4f497ae..d630522a5d 100644
--- a/c/src/lib/libbsp/sparc/leon3/leon_greth/leon_greth.c
+++ b/c/src/lib/libbsp/sparc/leon3/leon_greth/leon_greth.c
@@ -9,6 +9,7 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
+#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
 
 #include <bsp.h>
 #include <libchip/greth.h>
diff --git a/c/src/lib/libbsp/sparc/leon3/leon_open_eth/leon_open_eth.c b/c/src/lib/libbsp/sparc/leon3/leon_open_eth/leon_open_eth.c
index 9de03720e0..c59d613d75 100644
--- a/c/src/lib/libbsp/sparc/leon3/leon_open_eth/leon_open_eth.c
+++ b/c/src/lib/libbsp/sparc/leon3/leon_open_eth/leon_open_eth.c
@@ -13,6 +13,7 @@
  * http://www.rtems.org/license/LICENSE.
  */
 
+#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
 
 #include <bsp.h>
 #include <libchip/open_eth.h>
diff --git a/c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c b/c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c
index 17218bef9f..e4adac6c2b 100644
--- a/c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c
+++ b/c/src/lib/libbsp/sparc/leon3/leon_smc91111/leon_smc91111.c
@@ -13,6 +13,8 @@
  * http://www.rtems.org/license/LICENSE.
  */
 
+#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+
 #include <bsp.h>
 #include <libchip/smc91111exp.h>
 #include <rtems/bspIo.h>
diff --git a/c/src/lib/libbsp/sparc/shared/net/greth.c b/c/src/lib/libbsp/sparc/shared/net/greth.c
index 5e2ee49087..eafcb9947a 100644
--- a/c/src/lib/libbsp/sparc/shared/net/greth.c
+++ b/c/src/lib/libbsp/sparc/shared/net/greth.c
@@ -11,6 +11,9 @@
  *              multiple GRETH cores. <daniel@gaisler.com>
  *  2007-09-07, Ported GBIT support from 4.6.5
  */
+
+#define __INSIDE_RTEMS_BSD_TCPIP_STACK__
+
 #include <rtems.h>
 #define _KERNEL
 #define CPU_U32_FIX