Patch rtems-rc-19991117-9.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>

to convert the libc directory to automake and "dozens of
small fixes for Makefile.ins/configure.ins below c/src/lib."

2 files changed, 127 insertions, 126 deletions

diff --git a/c/src/lib/libc/Makefile.am b/c/src/lib/libc/Makefile.am
new file mode 100644
index 0000000000..853b722749
--- /dev/null
+++ b/c/src/lib/libc/Makefile.am
@@ -0,0 +1,127 @@
+##
+##  $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+LIBNAME = libcsupport
+LIB = ${ARCH}/${LIBNAME}.a
+
+ERROR_C_FILES = error.c
+
+ASSOCIATION_C_FILES = assoc.c assocnamebad.c
+
+BASE_FS_C_FILES = base_fs.c mount.c unmount.c ioman.c libio.c \
+    libio_sockets.c eval.c fs_null_handlers.c
+
+IMFS_C_FILES = imfs_chown.c imfs_creat.c imfs_directory.c imfs_eval.c \
+    imfs_free.c imfs_fsunmount.c imfs_gtkn.c imfs_init.c imfs_initsupp.c \
+    imfs_link.c imfs_mknod.c imfs_mount.c imfs_fchmod.c imfs_unlink.c \
+    imfs_unmount.c imfs_utime.c imfs_ntype.c imfs_stat.c imfs_getchild.c \
+    memfile.c deviceio.c imfs_handlers_device.c imfs_handlers_directory.c \
+    imfs_handlers_link.c imfs_handlers_memfile.c imfs_debug.c imfs_rmnod.c \
+    imfs_symlink.c imfs_readlink.c imfs_fdatasync.c imfs_fcntl.c \
+    miniimfs_init.c
+
+TERMIOS_C_FILES = cfgetispeed.c cfgetospeed.c cfsetispeed.c cfsetospeed.c \
+    tcgetattr.c tcsetattr.c tcdrain.c tcflow.c tcflush.c tcgetprgrp.c \
+    tcsendbreak.c tcsetpgrp.c termios.c termiosinitialize.c \
+    termiosreserveresources.c
+
+SYSTEM_CALL_C_FILES = open.c close.c read.c write.c lseek.c ioctl.c mkdir.c \
+    mknod.c mkfifo.c rmdir.c chdir.c chmod.c fchmod.c chown.c link.c \
+    unlink.c umask.c ftruncate.c utime.c fstat.c fcntl.c fpathconf.c \
+    getdents.c fsync.c fdatasync.c pipe.c dup.c dup2.c symlink.c readlink.c \
+    creat.c
+
+DIRECTORY_SCAN_C_FILES = opendir.c closedir.c readdir.c rewinddir.c \
+    scandir.c seekdir.c telldir.c getcwd.c
+
+MALLOC_C_FILES = malloc.c __brk.c __sbrk.c
+
+PASSWORD_GROUP_C_FILES = getpwent.c getgrent.c
+
+TERMINAL_IDENTIFICATION_C_FILES = ctermid.c isatty.c ttyname.c ttyname_r.c
+
+LIBC_GLUE_C_FILES = __getpid.c __gettod.c __times.c truncate.c access.c \
+    stat.c lstat.c pathconf.c newlibc.c no_posix.c no_libc.c
+
+UNIX_LIBC_C_FILES = unixlibc.c hosterr.c
+
+# C and C++ source names, if any, go here -- minus the .c or .cc
+COMMON_C_FILES = $(BASE_FS_C_FILES)  $(MALLOC_C_FILES) \
+    $(TERMIOS_C_FILES) $(ERROR_C_FILES) $(ASSOCIATION_C_FILES)
+
+UNIX_C_FILES = $(UNIX_LIBC_C_FILES) imfs_unixstub.c
+
+EMBEDDED_C_FILES = $(LIBC_GLUE_C_FILES) \
+    $(PASSWORD_GROUP_C_FILES) $(TERMINAL_IDENTIFICATION_C_FILES) \
+    $(SYSTEM_CALL_C_FILES) $(DIRECTORY_SCAN_C_FILES) \
+    $(IMFS_C_FILES)
+
+if UNIX
+C_FILES = $(COMMON_C_FILES) $(UNIX_C_FILES)
+else
+C_FILES = $(COMMON_C_FILES) $(EMBEDDED_C_FILES)
+endif
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+
+H_FILES = libcsupport.h imfs.h
+SYS_H_FILES =
+RTEMS_H_FILES = assoc.h error.h libio.h
+noinst_HEADERS = libio_.h
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/lib.am
+
+PREINSTALL_FILES = \
+$(PROJECT_INCLUDE) \
+$(PROJECT_INCLUDE)/rtems \
+$(PROJECT_INCLUDE)/sys \
+$(H_FILES:%=$(PROJECT_INCLUDE)/%) \
+$(RTEMS_H_FILES:%=$(PROJECT_INCLUDE)/rtems/%) \
+$(SYS_H_FILES:%=$(PROJECT_INCLUDE)/sys/%)
+
+$(PROJECT_INCLUDE):
+	@$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/rtems:
+	@$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/sys:
+	@$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/%.h: %.h
+	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/rtems/%.h: %.h
+	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/sys/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES += \
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
+
+SRCS = $(C_FILES) $(H_FILES) $(SYS_H_FILES) $(RTEMS_H_FILES)
+OBJS = $(C_O_FILES)
+
+#
+# Add local stuff here using +=
+#
+
+AM_CFLAGS += $(LIBC_DEFINES)
+
+all: ${ARCH} $(TMPINSTALL_FILES)
+
+$(LIB): ${OBJS}
+	$(make-library)
+
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
+	$(INSTALL_DATA) $< $@
+
+DOC_FILES = TODO CASES
+
+## This only works with automake > 1.14
+EXTRA_DIST = \
+$(DOC_FILES) \
+$(COMMON_C_FILES) $(EMBEDDED_C_FILES) $(UNIX_C_FILES) \
+$(H_FILES) $(RTEMS_H_FILES) $(SYS_H_FILES)
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libc/Makefile.in b/c/src/lib/libc/Makefile.in
deleted file mode 100644
index c94ef1bda9..0000000000
--- a/c/src/lib/libc/Makefile.in
+++ /dev/null
@@ -1,126 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = libc
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-LIBNAME = libcsupport.a
-LIB = ${ARCH}/${LIBNAME}
-
-ERROR_C_PIECES=error
-
-ASSOCIATION_C_PIECES=assoc assocnamebad
-
-BASE_FS_C_PIECES = base_fs mount unmount ioman libio libio_sockets eval \
-    fs_null_handlers
-
-IMFS_C_PIECES = imfs_chown imfs_creat imfs_directory imfs_eval imfs_free \
-    imfs_fsunmount imfs_gtkn imfs_init imfs_initsupp imfs_link imfs_mknod \
-    imfs_mount imfs_fchmod imfs_unlink imfs_unmount imfs_utime \
-    imfs_ntype imfs_stat imfs_getchild memfile deviceio imfs_handlers_device \
-    imfs_handlers_directory imfs_handlers_link imfs_handlers_memfile \
-    imfs_debug imfs_rmnod imfs_symlink imfs_readlink imfs_fdatasync \
-    imfs_fcntl miniimfs_init
-
-TERMIOS_C_PIECES = cfgetispeed cfgetospeed cfsetispeed cfsetospeed tcgetattr \
-    tcsetattr tcdrain tcflow tcflush tcgetprgrp tcsendbreak tcsetpgrp \
-    termios termiosinitialize termiosreserveresources
-
-SYSTEM_CALL_C_PIECES = open close read write lseek ioctl mkdir mknod mkfifo \
-    rmdir chdir chmod fchmod chown link unlink umask ftruncate utime fstat \
-    fcntl fpathconf getdents fsync fdatasync pipe dup dup2 symlink readlink \
-    creat 
-
-DIRECTORY_SCAN_C_PIECES = opendir closedir readdir rewinddir scandir seekdir \
-    telldir getcwd
-
-MALLOC_C_PIECES = malloc __brk __sbrk
-
-PASSWORD_GROUP_C_PIECES = getpwent getgrent
-
-TERMINAL_IDENTIFICATION = ctermid isatty ttyname ttyname_r 
-
-LIBC_GLUE_C_PIECES = __getpid __gettod __times truncate access stat \
-    lstat pathconf newlibc no_posix no_libc
-
-UNIX_LIBC_C_PIECES = unixlibc hosterr
-
-# C and C++ source names, if any, go here -- minus the .c or .cc
-UNIX_C_PIECES = $(UNIX_LIBC_C_PIECES) $(BASE_FS_C_PIECES) $(MALLOC_C_PIECES) \
-    $(TERMIOS_C_PIECES) $(ERROR_C_PIECES) $(ASSOCIATION_C_PIECES) \
-    imfs_unixstub
-
-EMBEDDED_C_PIECES = $(LIBC_GLUE_C_PIECES) $(BASE_FS_C_PIECES) \
-    $(MALLOC_C_PIECES) $(PASSWORD_GROUP_C_PIECES) $(TERMINAL_IDENTIFICATION) \
-    $(TERMIOS_C_PIECES) $(SYSTEM_CALL_C_PIECES) $(DIRECTORY_SCAN_C_PIECES) \
-    $(IMFS_C_PIECES) $(ERROR_C_PIECES) $(ASSOCIATION_C_PIECES)
-
-
-@UNIX_TRUE@C_PIECES = $(UNIX_C_PIECES)
-@UNIX_FALSE@C_PIECES = $(EMBEDDED_C_PIECES)
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-H_FILES = $(srcdir)/libcsupport.h $(srcdir)/imfs.h
-SYS_H_FILES =
-RTEMS_H_FILES = $(srcdir)/assoc.h $(srcdir)/error.h $(srcdir)/libio.h
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems $(PROJECT_INCLUDE)/sys \
-    $(PROJECT_INCLUDE)
-
-$(INSTALLDIRS):
-	@$(mkinstalldirs) $(INSTALLDIRS)
-
-SRCS = $(C_FILES) $(H_FILES) $(SYS_H_FILES) $(RTEMS_H_FILES)
-OBJS = $(C_O_FILES)
-
-#
-# Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS += $(LIBC_DEFINES)
-
-#
-# 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 += $(LIB)
-CLOBBER_ADDITIONS +=
-
-all: ${ARCH} preinstall $(LIB)
-	@$(INSTALL_VARIANT) -m 644 ${LIB} $(PROJECT_RELEASE)/lib
-
-$(LIB): $(SRCS) ${OBJS}
-	$(make-library)
-
-# Install the library, appending _g or _p as appropriate.
-# for include files, just use $(INSTALL_CHANGE)
-preinstall: 
-	@$(mkinstalldirs) $(INSTALLDIRS)
-	@$(INSTALL_CHANGE) -m 644 $(RTEMS_H_FILES) $(PROJECT_INCLUDE)/rtems
-	@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)
-	@$(INSTALL_CHANGE) -m 644 $(SYS_H_FILES) $(PROJECT_INCLUDE)/sys
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status