From fba12eb6ff4a91fcbac1c43dd3196114cc12756b Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 23 Nov 1999 13:29:04 +0000 Subject: Patch rtems-rc-19991117-11.diff from Ralf Corsepius to convert the libc directory to automake and "dozens of small fixes for Makefile.ins/configure.ins below c/src/lib." --- c/src/exec/sapi/macros/rtems/Makefile.am | 2 +- c/src/exec/sapi/optman/Makefile.am | 39 +++++++++++++++++++++ c/src/exec/sapi/optman/Makefile.in | 58 -------------------------------- c/src/exec/sapi/src/Makefile.am | 28 +++++++++++++++ c/src/exec/sapi/src/Makefile.in | 51 ---------------------------- 5 files changed, 68 insertions(+), 110 deletions(-) create mode 100644 c/src/exec/sapi/optman/Makefile.am delete mode 100644 c/src/exec/sapi/optman/Makefile.in create mode 100644 c/src/exec/sapi/src/Makefile.am delete mode 100644 c/src/exec/sapi/src/Makefile.in (limited to 'c/src/exec/sapi') diff --git a/c/src/exec/sapi/macros/rtems/Makefile.am b/c/src/exec/sapi/macros/rtems/Makefile.am index 962bf5aec0..991f6865b2 100644 --- a/c/src/exec/sapi/macros/rtems/Makefile.am +++ b/c/src/exec/sapi/macros/rtems/Makefile.am @@ -4,11 +4,11 @@ AUTOMAKE_OPTIONS = foreign 1.4 -if MACROS I_FILES = extension.inl noinst_HEADERS = $(I_FILES) +if MACROS PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/rtems \ $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%) diff --git a/c/src/exec/sapi/optman/Makefile.am b/c/src/exec/sapi/optman/Makefile.am new file mode 100644 index 0000000000..34b23d5f6c --- /dev/null +++ b/c/src/exec/sapi/optman/Makefile.am @@ -0,0 +1,39 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +C_FILES = no-ext.c no-io.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) + +SRCS = $(C_FILES) +OBJS = $(C_O_FILES) + +PGMNAME = $(C_FILES:%.c=%) +PGMS = $(C_FILES:%.c=$(ARCH)/%.rel) + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(RTEMS_ROOT)/make/leaf.cfg + +TMPINSTALL_FILES = \ +$(PROJECT_RELEASE)/lib \ +$(PGMNAME:%=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel) + +# +# (OPTIONAL) Add local stuff here using += +# + +AM_CFLAGS += $(CFLAGS_OS_V) +ASM4FLAGS += -I $(PROJECT_INCLUDE)/rtems + +$(PROJECT_RELEASE)/lib: + $(mkinstalldirs) $@ +$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel + $(INSTALL_DATA) $< $@ + +all: ${ARCH} $(TMPINSTALL_FILES) + +EXTRA_DIST = $(C_FILES) + +include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/exec/sapi/optman/Makefile.in b/c/src/exec/sapi/optman/Makefile.in deleted file mode 100644 index 3305f26eeb..0000000000 --- a/c/src/exec/sapi/optman/Makefile.in +++ /dev/null @@ -1,58 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = sapi/optman - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -C_FILES = no-ext.c no-io.c - -H_FILES = - -SRCS = $(C_FILES) $(H_FILES) -OBJS = $(C_O_FILES) $(S_O_FILES) - -PGMS = $(C_FILES:%.c=$(ARCH)/%.rel) - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/leaf.cfg - -INSTALL_CHANGE = @INSTALL_CHANGE@ - -# -# (OPTIONAL) Add local stuff here using += -# - -DEFINES += -CPPFLAGS += -CFLAGS += $(CFLAGS_OS_V) - -ASM4FLAGS += -I $(PROJECT_INCLUDE)/rtems -LD_PATHS += -LD_LIBS += -LDFLAGS += - -# -# Add your list of files to delete here. The config files -# already know how to delete some stuff, so you may want -# to just run 'make clean' first to see what gets missed. -# 'make clobber' already includes 'make clean' -# - -CLEAN_ADDITIONS += -CLOBBER_ADDITIONS += - -all: ${ARCH} $(SRCS) $(OBJS) $(PGMS) - $(INSTALL_VARIANT) -m 755 ${PGMS} $(PROJECT_RELEASE)/lib - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/exec/sapi/src/Makefile.am b/c/src/exec/sapi/src/Makefile.am new file mode 100644 index 0000000000..d4c32b0ee7 --- /dev/null +++ b/c/src/exec/sapi/src/Makefile.am @@ -0,0 +1,28 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +C_FILES = debug.c entrytable.c extension.c fatal.c exinit.c io.c itronapi.c \ + posixapi.c rtemsapi.c +C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) + +SRCS = $(C_FILES) +OBJS = $(C_O_FILES) + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../automake/lib.am + +# +# Add local stuff here using += +# + +AM_CPPFLAGS += -D__RTEMS_INSIDE__ +AM_CFLAGS += $(CFLAGS_OS_V) + +all: ${ARCH} ${OBJS} + +EXTRA_DIST = $(C_FILES) + +include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/exec/sapi/src/Makefile.in b/c/src/exec/sapi/src/Makefile.in deleted file mode 100644 index 102c7cd24a..0000000000 --- a/c/src/exec/sapi/src/Makefile.in +++ /dev/null @@ -1,51 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = sapi/src - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -C_PIECES = debug entrytable extension fatal exinit io \ - itronapi posixapi rtemsapi -C_FILES = $(C_PIECES:%=%.c) -C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) - -SRCS = $(C_FILES) -OBJS = $(C_O_FILES) - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/lib.cfg - -INSTALL_CHANGE = @INSTALL_CHANGE@ - -# -# Add local stuff here using += -# - -DEFINES += -D__RTEMS_INSIDE__ -CPPFLAGS += -CFLAGS += $(CFLAGS_OS_V) - -# -# Add your list of files to delete here. The config files -# already know how to delete some stuff, so you may want -# to just run 'make clean' first to see what gets missed. -# 'make clobber' already includes 'make clean' -# - -CLEAN_ADDITIONS += -CLOBBER_ADDITIONS += - -all: ${ARCH} $(SRCS) ${OBJS} - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -- cgit v1.2.3