diff --git a/src/RTEMS/Makefile b/src/RTEMS/Makefile index 526c8eba0..93a7c26d7 100644 --- a/src/RTEMS/Makefile +++ b/src/RTEMS/Makefile @@ -6,15 +6,20 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* -# -# $Revision-Id$ -# - -TOP = ../.. - +TOP=../.. include $(TOP)/configure/CONFIG -DIRS += base +INC += epicsRtemsInitHooks.h -include $(TOP)/configure/RULES_DIRS +SRCS += rtems_init.c +SRCS += rtems_config.c +SRCS += rtems_netconfig.c +SRCS += rtems_util.c +SRCS += setBootConfigFromNVRAM.c +SRCS += epicsRtemsInitHookPre.c +SRCS += epicsRtemsInitHookPost.c +LIBRARY_RTEMS = rtemsCom +LIBRARY_SRCS = $(SRCS) $(BUILD_ARCHS) + +include $(TOP)/configure/RULES diff --git a/src/RTEMS/base/Makefile b/src/RTEMS/base/Makefile deleted file mode 100644 index 98d24509f..000000000 --- a/src/RTEMS/base/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -#************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne -# National Laboratory. -# Copyright (c) 2002 The Regents of the University of California, as -# Operator of Los Alamos National Laboratory. -# EPICS BASE Versions 3.13.7 -# and higher are distributed subject to a Software License Agreement found -# in file LICENSE that is included with this distribution. -#************************************************************************* -TOP=../../.. -include $(TOP)/configure/CONFIG - -INC += epicsRtemsInitHooks.h - -SRCS += rtems_init.c -SRCS += rtems_config.c -SRCS += rtems_netconfig.c -SRCS += rtems_util.c -SRCS += setBootConfigFromNVRAM.c -SRCS += epicsRtemsInitHookPre.c -SRCS += epicsRtemsInitHookPost.c - -LIBRARY_RTEMS = rtemsCom -LIBRARY_SRCS = $(SRCS) $(BUILD_ARCHS) - -include $(TOP)/configure/RULES diff --git a/src/RTEMS/base/epicsRtemsInitHookPost.c b/src/RTEMS/epicsRtemsInitHookPost.c similarity index 100% rename from src/RTEMS/base/epicsRtemsInitHookPost.c rename to src/RTEMS/epicsRtemsInitHookPost.c diff --git a/src/RTEMS/base/epicsRtemsInitHookPre.c b/src/RTEMS/epicsRtemsInitHookPre.c similarity index 100% rename from src/RTEMS/base/epicsRtemsInitHookPre.c rename to src/RTEMS/epicsRtemsInitHookPre.c diff --git a/src/RTEMS/base/epicsRtemsInitHooks.h b/src/RTEMS/epicsRtemsInitHooks.h similarity index 100% rename from src/RTEMS/base/epicsRtemsInitHooks.h rename to src/RTEMS/epicsRtemsInitHooks.h diff --git a/src/RTEMS/base/rtems_config.c b/src/RTEMS/rtems_config.c similarity index 100% rename from src/RTEMS/base/rtems_config.c rename to src/RTEMS/rtems_config.c diff --git a/src/RTEMS/base/rtems_init.c b/src/RTEMS/rtems_init.c similarity index 100% rename from src/RTEMS/base/rtems_init.c rename to src/RTEMS/rtems_init.c diff --git a/src/RTEMS/base/rtems_netconfig.c b/src/RTEMS/rtems_netconfig.c similarity index 100% rename from src/RTEMS/base/rtems_netconfig.c rename to src/RTEMS/rtems_netconfig.c diff --git a/src/RTEMS/base/rtems_util.c b/src/RTEMS/rtems_util.c similarity index 100% rename from src/RTEMS/base/rtems_util.c rename to src/RTEMS/rtems_util.c diff --git a/src/RTEMS/base/setBootConfigFromNVRAM.c b/src/RTEMS/setBootConfigFromNVRAM.c similarity index 100% rename from src/RTEMS/base/setBootConfigFromNVRAM.c rename to src/RTEMS/setBootConfigFromNVRAM.c