8 files changed, 64 insertions, 9 deletions
diff --git a/c/src/aclocal/bsp-configure.m4 b/c/src/aclocal/bsp-configure.m4
index c6ff76319a..6f560fd3f5 100644
--- a/c/src/aclocal/bsp-configure.m4
+++ b/c/src/aclocal/bsp-configure.m4
@@ -8,7 +8,7 @@ AC_DEFUN([RTEMS_BSP_CONFIGURE],
 
   RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 
-  AC_CONFIG_HEADERS([include/bspopts.tmp:include/bspopts.h.in],[
+  AC_CONFIG_HEADERS([include/bspopts.tmp:bspopts.h.in],[
 echo "/* BSP dependent options file */"         >$tmp/config.h
 echo "/* automatically generated -- DO NOT EDIT!! */" >>$tmp/config.h
 echo                                                  >>$tmp/config.h
diff --git a/c/src/aclocal/bsp-linkcmds.m4 b/c/src/aclocal/bsp-linkcmds.m4
index 397609f6e0..3e40638f88 100644
--- a/c/src/aclocal/bsp-linkcmds.m4
+++ b/c/src/aclocal/bsp-linkcmds.m4
@@ -13,5 +13,5 @@ done
 AS_IF([test -z "${LINKCMDS}"],[
   AC_MSG_ERROR([can not determine linkcmds])])
 
-AC_CONFIG_LINKS([startup/linkcmds:${LINKCMDS}])
+AC_CONFIG_LINKS([linkcmds:${LINKCMDS}])
 ])
diff --git a/c/src/aclocal/check-networking.m4 b/c/src/aclocal/check-networking.m4
index 250d669705..89e53f638e 100644
--- a/c/src/aclocal/check-networking.m4
+++ b/c/src/aclocal/check-networking.m4
@@ -2,6 +2,7 @@ AC_DEFUN([RTEMS_CHECK_NETWORKING],
 [dnl
 AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])dnl
 AC_REQUIRE([RTEMS_ENABLE_NETWORKING])dnl
+AC_REQUIRE([RTEMS_INCLUDES])dnl
 
 AC_CACHE_CHECK([whether BSP supports networking],
   rtems_cv_HAS_NETWORKING,
@@ -21,6 +22,7 @@ AC_CACHE_CHECK([whether BSP supports networking],
     esac])
 if test "$rtems_cv_HAS_NETWORKING" = "yes"; then
   HAS_NETWORKING="yes";
+  RTEMS_CPPFLAGS="${RTEMS_CPPFLAGS} -I${RTEMS_SOURCE_ROOT}/cpukit/libnetworking";
 else
   HAS_NETWORKING="no";
 fi
diff --git a/c/src/aclocal/prog-cc.m4 b/c/src/aclocal/prog-cc.m4
index 44dfd2ddd7..ec33bc9bcf 100644
--- a/c/src/aclocal/prog-cc.m4
+++ b/c/src/aclocal/prog-cc.m4
@@ -29,18 +29,15 @@ dnl check if the compiler supports --specs
 RTEMS_GCC_SPECS
 
 AS_IF([test x"$rtems_cv_gcc_specs" = xyes],[
-GCCSPECS="-B\$(PROJECT_ROOT)/lib/ -B\$(PROJECT_ROOT)/$RTEMS_BSP/lib/"
+GCCSPECS="-B\$(RTEMS_SOURCE_ROOT)/c/src/lib/libbsp/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/"
 GCCSPECS="${GCCSPECS} -specs bsp_specs -qrtems"])
 AC_SUBST(GCCSPECS)
 
-AS_IF([test x"$rtems_cv_gcc_isystem" = xyes],[
-  RTEMS_CPPFLAGS="-isystem \$(PROJECT_INCLUDE)"],[
-  RTEMS_CPPFLAGS="-I\$(PROJECT_INCLUDE)"
-])
-AC_SUBST(RTEMS_CPPFLAGS)
-
 AS_IF([test "$GCC" = yes],[
   RTEMS_RELLDFLAGS="-qnolinkcmds -nostdlib -r"
 ])
 AC_SUBST(RTEMS_RELLDFLAGS)
+
+RTEMS_INCLUDES
+RTEMS_BSP_INCLUDES
 ])
diff --git a/c/src/aclocal/rtems-bsp-includes.m4 b/c/src/aclocal/rtems-bsp-includes.m4
new file mode 100644
index 0000000000..2248211192
--- /dev/null
+++ b/c/src/aclocal/rtems-bsp-includes.m4
@@ -0,0 +1,13 @@
+dnl
+dnl RTEMS Include paths.
+dnl
+AC_DEFUN([RTEMS_BSP_INCLUDES],
+[
+AC_REQUIRE([RTEMS_SOURCE_TOP])
+AC_REQUIRE([RTEMS_BUILD_TOP])
+RTEMS_BSP_CPPFLAGS="-I${RTEMS_BUILD_ROOT}/lib/libbsp/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/include \
+-I${RTEMS_SOURCE_ROOT}/bsps/include \
+-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/include \
+-I${RTEMS_SOURCE_ROOT}/bsps/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/include"
+AC_SUBST([RTEMS_BSP_CPPFLAGS])
+])
diff --git a/c/src/aclocal/rtems-build-top.m4 b/c/src/aclocal/rtems-build-top.m4
new file mode 100644
index 0000000000..5708119c14
--- /dev/null
+++ b/c/src/aclocal/rtems-build-top.m4
@@ -0,0 +1,12 @@
+dnl
+dnl RTEMS_BUILD_TOP($1)
+dnl
+AC_DEFUN([RTEMS_BUILD_TOP],
+[dnl
+#
+# This is a copy of the horrible hack in rtems-top.m4 and it is simpler to
+# copy it that attempt to clean this crap up.
+#
+RTEMS_BUILD_ROOT="${with_rtems_build_top}"
+AC_SUBST([RTEMS_BUILD_ROOT])
+])dnl
diff --git a/c/src/aclocal/rtems-includes.m4 b/c/src/aclocal/rtems-includes.m4
new file mode 100644
index 0000000000..ca4ebed581
--- /dev/null
+++ b/c/src/aclocal/rtems-includes.m4
@@ -0,0 +1,23 @@
+dnl
+dnl RTEMS Include paths.
+dnl
+AC_DEFUN([RTEMS_INCLUDES],
+[
+AC_REQUIRE([RTEMS_SOURCE_TOP])
+AC_REQUIRE([RTEMS_BUILD_TOP])
+
+# Was CFLAGS set?
+rtems_cv_CFLAGS_set="${CFLAGS+set}"
+
+RTEMS_INCLUDE_CPUKIT="-I${RTEMS_SOURCE_ROOT}/cpukit/include"
+RTEMS_INCLUDE_CPUKIT_ARCH="-I${RTEMS_SOURCE_ROOT}/cpukit/score/cpu/\$(RTEMS_CPU)/include"
+
+RTEMS_CPUKIT_INCLUDE="${RTEMS_INCLUDE_CPUKIT} ${RTEMS_INCLUDE_CPUKIT_ARCH}"
+RTEMS_BUILD_INCLUDE="-I\$(top_builddir) -I${RTEMS_BUILD_ROOT}/include"
+
+RTEMS_INCLUDE="${RTEMS_BUILD_INCLUDE} ${RTEMS_CPUKIT_INCLUDE}"
+
+RTEMS_CPPFLAGS="${RTEMS_INCLUDE}"
+
+AC_SUBST([RTEMS_CPPFLAGS])
+])
diff --git a/c/src/aclocal/rtems-source-top.m4 b/c/src/aclocal/rtems-source-top.m4
new file mode 100644
index 0000000000..d1460ae82d
--- /dev/null
+++ b/c/src/aclocal/rtems-source-top.m4
@@ -0,0 +1,8 @@
+dnl
+dnl RTEMS_SOURCE_TOP
+dnl
+AC_DEFUN([RTEMS_SOURCE_TOP],
+[dnl
+RTEMS_SOURCE_ROOT="${with_rtems_source_top}"
+AC_SUBST([RTEMS_SOURCE_ROOT])
+])dnl