From 64a1cd8cb6d320852f42f6ee889e8709d8229b5f Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Tue, 28 Jan 2020 15:44:31 -0500 Subject: [PATCH] Remove obsolete *.mak files --- fsw/cfe-core/src/es/cfe_es.mak | 27 ------ fsw/cfe-core/src/evs/cfe_evs.mak | 21 ----- fsw/cfe-core/src/fs/cfe_fs.mak | 25 ------ fsw/cfe-core/src/make/app-rules.mak | 125 -------------------------- fsw/cfe-core/src/make/make-rules.mak | 73 --------------- fsw/cfe-core/src/make/table-rules.mak | 43 --------- fsw/cfe-core/src/sb/cfe_sb.mak | 24 ----- fsw/cfe-core/src/tbl/cfe_tbl.mak | 26 ------ fsw/cfe-core/src/time/cfe_time.mak | 26 ------ 9 files changed, 390 deletions(-) delete mode 100644 fsw/cfe-core/src/es/cfe_es.mak delete mode 100644 fsw/cfe-core/src/evs/cfe_evs.mak delete mode 100644 fsw/cfe-core/src/fs/cfe_fs.mak delete mode 100644 fsw/cfe-core/src/make/app-rules.mak delete mode 100644 fsw/cfe-core/src/make/make-rules.mak delete mode 100644 fsw/cfe-core/src/make/table-rules.mak delete mode 100644 fsw/cfe-core/src/sb/cfe_sb.mak delete mode 100644 fsw/cfe-core/src/tbl/cfe_tbl.mak delete mode 100644 fsw/cfe-core/src/time/cfe_time.mak diff --git a/fsw/cfe-core/src/es/cfe_es.mak b/fsw/cfe-core/src/es/cfe_es.mak deleted file mode 100644 index 0ba5aa2c0..000000000 --- a/fsw/cfe-core/src/es/cfe_es.mak +++ /dev/null @@ -1,27 +0,0 @@ -############################################################################### -# File: cfe_es.mak -# -# Purpose: -# Compile the Executive Services (ES) startup/runtime code. -# The ES task is built with cfe_estask.mak -# -# History: -# 2004/11/19 S. Walling : Initial revision for cFE -# -############################################################################### - -# Subsystem produced by this makefile. -TARGET = es.o - -#============================================================================== -# Object files required to build subsystem. - -OBJS=cfe_es_start.o cfe_es_api.o cfe_es_objtab.o cfe_es_apps.o cfe_esmempool.o \ -cfe_es_perf.o cfe_es_shell.o cfe_es_cds_mempool.o cfe_es_cds.o cfe_es_erlog.o \ -cfe_es_task.o cfe_es_syslog.o - -#============================================================================== -# Source files required to build subsystem; used to generate dependencies. - -SOURCES = $(OBJS:.o=.c) - diff --git a/fsw/cfe-core/src/evs/cfe_evs.mak b/fsw/cfe-core/src/evs/cfe_evs.mak deleted file mode 100644 index fea0e8312..000000000 --- a/fsw/cfe-core/src/evs/cfe_evs.mak +++ /dev/null @@ -1,21 +0,0 @@ -############################################################################### -# File: cfe_evs.mak -# -# Purpose: -# Compile the Event Services (EVS) task. -# -############################################################################### - -# Subsystem produced by this makefile. -TARGET = evs.o - -#============================================================================== -# Object files required to build subsystem. - -OBJS=cfe_evs.o cfe_evs_task.o cfe_evs_log.o cfe_evs_utils.o - -#============================================================================== -# Source files required to build subsystem; used to generate dependencies. - -SOURCES = $(OBJS:.o=.c) - diff --git a/fsw/cfe-core/src/fs/cfe_fs.mak b/fsw/cfe-core/src/fs/cfe_fs.mak deleted file mode 100644 index 5262d2c36..000000000 --- a/fsw/cfe-core/src/fs/cfe_fs.mak +++ /dev/null @@ -1,25 +0,0 @@ -############################################################################### -# -# File: cfe_fs.mak -# -# Purpose: cFE File Services (FS) make file -# -# Author: S.Walling/Microtel -# -# Notes: Creates a combination of the File Services task and API library -# -############################################################################### - -# Subsystem produced by this makefile. -TARGET = fs.o - -#============================================================================== -# Object files required to build subsystem. - -OBJS = cfe_fs_priv.o cfe_fs_api.o cfe_fs_decompress.o - -#============================================================================== -# Source files required to build subsystem; used to generate dependencies. - -SOURCES = $(OBJS:.o=.c) - diff --git a/fsw/cfe-core/src/make/app-rules.mak b/fsw/cfe-core/src/make/app-rules.mak deleted file mode 100644 index 59ed29433..000000000 --- a/fsw/cfe-core/src/make/app-rules.mak +++ /dev/null @@ -1,125 +0,0 @@ -############################################################################### -# File: app-rules.mak -# -# Purpose: cFE Application make rules. This file contains common make rules to -# be included by cFE application make files. -# -# -# History: -# -############################################################################### - -## -## Default rule for building the App Loadable file -## -default: $(APPTARGET).$(APP_EXT) - -## -## Default Compiler rule -## -.c.o: - $(COMPILER) $(LOCAL_COPTS) $(INCLUDE_PATH) $(COPTS) $(DEBUG_OPTS) -DOS_DEBUG_LEVEL=$(DEBUG_LEVEL) -c -o $@ $< - -## -## Default Assembly Code Rule -## -.s.o: - $(COMPILER) $(LOCAL_COPTS) $(INCLUDE_PATH) $(ASOPTS) $(COPTS) $(DEBUG_OPTS) -DOS_DEBUG_LEVEL=$(DEBUG_LEVEL) -c -o $@ $< - -## -## Rule to generate the dependancy list -## -depend: $(SOURCES) - $(COMPILER) -MM $(LOCAL_COPTS) $(INCLUDE_PATH) $(COPTS_D) $(DEBUG_OPTS) -DOS_DEBUG_LEVEL=$(DEBUG_LEVEL) -c $^ > $(APPTARGET).d - -## -## Include the rule for linking the cFE application. -## This is architecture/compiler/os specific, so it must be included from the ARCH directory -## -include $(CFE_PSP_SRC)/$(PSP)/make/link-rules.mak - -## -## Default rule for installing app -## -install: - $(CP) $(APPTARGET).$(APP_EXT) $(EXEDIR) - -installdocs: - -mkdir -p $(CFS_MISSION)/docs/users_guide/html/$(CPUNAME)/$(APPTARGET)/ - -mkdir -p $(CFS_MISSION)/docs/users_guide/latex/$(CPUNAME)/$(APPTARGET)/ - -$(CP) ../docs/users_guide/html/$(APPTARGET)/*.* $(CFS_MISSION)/docs/users_guide/html/$(CPUNAME)/$(APPTARGET)/ - -$(CP) ../docs/users_guide/latex/$(APPTARGET)/*.* $(CFS_MISSION)/docs/users_guide/latex/$(CPUNAME)/$(APPTARGET)/ - -mkdir -p $(CFS_MISSION)/docs/detailed_design/html/$(CPUNAME)/$(APPTARGET)/ - -mkdir -p $(CFS_MISSION)/docs/detailed_design/latex/$(CPUNAME)/$(APPTARGET)/ - -$(CP) ../docs/detailed_design/html/$(APPTARGET)/*.* $(CFS_MISSION)/docs/detailed_design/html/$(CPUNAME)/$(APPTARGET)/ - -$(CP) ../docs/detailed_design/latex/$(APPTARGET)/*.* $(CFS_MISSION)/docs/detailed_design/latex/$(CPUNAME)/$(APPTARGET)/ - -## -## Default rule for generating a users guide -## -usersguide:: - -mkdir -p ../docs/users_guide/html/$(APPTARGET)/ - -mkdir -p ../docs/users_guide/latex/$(APPTARGET)/ - doxygen user_doxy - -## -## Default rule for generating a detailed design documentation -## -detaileddocs:: - -mkdir -p ../docs/detailed_design/html/$(APPTARGET)/ - -mkdir -p ../docs/detailed_design/latex/$(APPTARGET)/ - doxygen detail_doxy - -## -## Default rule for generating code walk-through documentation -## -codewalkdocs:: - sh ../docs/dox_src/get_date.sh - -mkdir -p $(CFS_APP_SRC)/$(APPTARGET)/docs/cwt/html - doxygen codewalk_doxy - - -## -## Rule for cleaning -## All of the possible extentions are included here so we can clean up after -## an old build -## -clean:: - -$(RM) *.o - -$(RM) *.g* - -$(RM) *.lis - -$(RM) *.bundle - -$(RM) *.so - -$(RM) *.dll - -$(RM) *.d - -$(RM) *.tbl - -cleandocs:: - -$(RM) ../docs/users_guide/html/$(APPTARGET)/*.html - -$(RM) ../docs/users_guide/html/$(APPTARGET)/*.css - -$(RM) ../docs/users_guide/html/$(APPTARGET)/*.png - -$(RM) ../docs/users_guide/html/$(APPTARGET)/*.dot - -$(RM) ../docs/users_guide/html/$(APPTARGET)/*.gif - -$(RM) ../docs/users_guide/latex/$(APPTARGET)/*.tex - -$(RM) ../docs/users_guide/latex/$(APPTARGET)/*.dot - -$(RM) ../docs/users_guide/latex/$(APPTARGET)/*.sty - -$(RM) ../docs/users_guide/latex/$(APPTARGET)/*.ttf - -$(RM) ../docs/users_guide/latex/$(APPTARGET)/Makefile - -$(RM) ../docs/detailed_design/html/$(APPTARGET)/*.html - -$(RM) ../docs/detailed_design/html/$(APPTARGET)/*.css - -$(RM) ../docs/detailed_design/html/$(APPTARGET)/*.png - -$(RM) ../docs/detailed_design/html/$(APPTARGET)/*.dot - -$(RM) ../docs/detailed_design/html/$(APPTARGET)/*.gif - -$(RM) ../docs/detailed_design/latex/$(APPTARGET)/*.tex - -$(RM) ../docs/detailed_design/latex/$(APPTARGET)/*.dot - -$(RM) ../docs/detailed_design/latex/$(APPTARGET)/*.sty - -$(RM) ../docs/detailed_design/latex/$(APPTARGET)/*.ttf - -$(RM) ../docs/detailed_design/latex/$(APPTARGET)/Makefile - -# -# Include the dependancy list -# --include $(APPTARGET).d - - -# eof diff --git a/fsw/cfe-core/src/make/make-rules.mak b/fsw/cfe-core/src/make/make-rules.mak deleted file mode 100644 index 5babe7812..000000000 --- a/fsw/cfe-core/src/make/make-rules.mak +++ /dev/null @@ -1,73 +0,0 @@ -## -## -## Common Make Rules for building cFE core subsystems -## This file is included by the individual cFE Core subsystems ( bsp, es, etc ) -## -## - -## -## The default "make" target is the subsystem object module. -## -default::$(TARGET) - -## -## Compiler rule -## -.c.o: - $(COMPILER) $(LOCAL_COPTS) $(INCLUDE_PATH) $(COPTS) $(DEBUG_OPTS) -DOS_DEBUG_LEVEL=$(DEBUG_LEVEL) -c -o $@ $< - -## -## Assembly Code Rule -## -.s.o: - $(COMPILER) $(LOCAL_COPTS) $(INCLUDE_PATH) $(ASOPTS) $(COPTS) $(DEBUG_OPTS) -DOS_DEBUG_LEVEL=$(DEBUG_LEVEL) -c -o $@ $< - -## -## Rule to generate the dependancy list -## -depend: $(SOURCES) - $(COMPILER) -MM $(LOCAL_COPTS) $(INCLUDE_PATH) $(COPTS_D) $(DEBUG_OPTS) -DOS_DEBUG_LEVEL=$(DEBUG_LEVEL) -c $^ > $(SUBSYS).d - - -## -## Subsystem Link rule -## -$(TARGET): $(OBJS) - $(LINKER) -o $(TARGET) -r $(OBJS) - -## -## Make clean rule -## -clean: - -$(RM) $(OBJS) $(TARGET) - -$(RM) *.lis - -$(RM) *.g* - -$(RM) *.d - -cleandocs: - -$(RM) ../../docs/users_guide/html/cfe/*.html - -$(RM) ../../docs/users_guide/html/cfe/*.css - -$(RM) ../../docs/users_guide/html/cfe/*.png - -$(RM) ../../docs/users_guide/html/cfe/*.dot - -$(RM) ../../docs/users_guide/html/cfe/*.gif - -$(RM) ../../docs/users_guide/latex/cfe/*.tex - -$(RM) ../../docs/users_guide/latex/cfe/*.dot - -$(RM) ../../docs/users_guide/latex/cfe/*.sty - -$(RM) ../../docs/users_guide/latex/cfe/*.ttf - -$(RM) ../../docs/users_guide/latex/cfe/Makefile - -$(RM) ../../docs/detailed_design/html/cfe/*.html - -$(RM) ../../docs/detailed_design/html/cfe/*.css - -$(RM) ../../docs/detailed_design/html/cfe/*.png - -$(RM) ../../docs/detailed_design/html/cfe/*.dot - -$(RM) ../../docs/detailed_design/html/cfe/*.gif - -$(RM) ../../docs/detailed_design/latex/cfe/*.tex - -$(RM) ../../docs/detailed_design/latex/cfe/*.dot - -$(RM) ../../docs/detailed_design/latex/cfe/*.sty - -$(RM) ../../docs/detailed_design/latex/cfe/*.ttf - -$(RM) ../../docs/detailed_design/latex/cfe/Makefile - -# -# Include the dependancy list -# --include $(SUBSYS).d - diff --git a/fsw/cfe-core/src/make/table-rules.mak b/fsw/cfe-core/src/make/table-rules.mak deleted file mode 100644 index 37a50642f..000000000 --- a/fsw/cfe-core/src/make/table-rules.mak +++ /dev/null @@ -1,43 +0,0 @@ -############################################################################### -# File: table-rules.mak -# -# Purpose: cFE table make rules. This file contains common make rules to -# be included by cFE table make files. -# -# History: -# -############################################################################### -.SUFFIXES: -.SUFFIXES:.c .C .o .O .tbl .TBL - -default::$(TABLES) - -# -# Default table rule -# The absolute path is not ideal, but this prevents the -# incorrect version of the utility from being used. -# -.o.tbl:$(OBJS) - ../$(TABLE_BIN)/$(TABLE_BIN) $< - -## -## Default Compiler rule -## -.c.o:$(SOURCES) - $(COMPILER) $(LOCAL_COPTS) $(INCLUDE_PATH) $(COPTS) $(TABLE_DEBUG_OPTS) -c -o $@ $< - -## -## Default rule for installing app -## -install: - $(CP) $(TABLES) $(EXEDIR) - -## -## Rule for cleaning -## All of the possible extentions are included here so we can clean up after -## an old build -## -clean:: - -$(RM) *.o - -$(RM) *.tbl - -$(RM) *.lis diff --git a/fsw/cfe-core/src/sb/cfe_sb.mak b/fsw/cfe-core/src/sb/cfe_sb.mak deleted file mode 100644 index a4c5eae36..000000000 --- a/fsw/cfe-core/src/sb/cfe_sb.mak +++ /dev/null @@ -1,24 +0,0 @@ -############################################################################### -# File: cfe_sb.mak -# -# Purpose: -# Compile the Software Bus task. -# -# History: -############################################################################### - -# Subsystem produced by this makefile. -TARGET = sb.o - -#============================================================================== -# Object files required to build subsystem. - -OBJS=\ - cfe_sb_task.o cfe_sb_api.o cfe_sb_priv.o cfe_sb_init.o cfe_sb_buf.o \ - cfe_sb_util.o ccsds.o cfe_sb_msg_id_util.o - -#============================================================================== -# Source files required to build subsystem; used to generate dependencies. - -SOURCES = $(OBJS:.o=.c) - diff --git a/fsw/cfe-core/src/tbl/cfe_tbl.mak b/fsw/cfe-core/src/tbl/cfe_tbl.mak deleted file mode 100644 index dd203f505..000000000 --- a/fsw/cfe-core/src/tbl/cfe_tbl.mak +++ /dev/null @@ -1,26 +0,0 @@ -############################################################################### -# -# File: cfe_tbl.mak -# -# Purpose: cFE Table Services (TBL) make file -# -# Author: K.Audra(Microtel-LLC) -# -# Notes: -# -############################################################################### - -# Subsystem produced by this makefile. -TARGET = tbl.o - -#============================================================================== -# Object files required to build subsystem. - -OBJS =\ - cfe_tbl_internal.o cfe_tbl_api.o cfe_tbl_task.o cfe_tbl_task_cmds.o - -#============================================================================== -# Source files required to build subsystem; used to generate dependencies. - -SOURCES = $(OBJS:.o=.c) - diff --git a/fsw/cfe-core/src/time/cfe_time.mak b/fsw/cfe-core/src/time/cfe_time.mak deleted file mode 100644 index 347bc4a7c..000000000 --- a/fsw/cfe-core/src/time/cfe_time.mak +++ /dev/null @@ -1,26 +0,0 @@ -############################################################################### -# -# File: cfe_time.mak -# -# Purpose: cFE Time Services (TIME) make file -# -# Author: S.Walling/Microtel -# -# Notes: Creates a combination of the Time Services task and API library -# -############################################################################### - -# Subsystem produced by this makefile. -TARGET = time.o - -#============================================================================== -# Object files required to build subsystem. - -OBJS =\ - cfe_time_task.o cfe_time_api.o cfe_time_utils.o cfe_time_tone.o - -#============================================================================== -# Source files required to build subsystem; used to generate dependencies. - -SOURCES = $(OBJS:.o=.c) -