From b8ad66c74f28d7fbaaf202e6bbb90da10fc91d8b Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 17 Jun 2002 15:05:53 +0000 Subject: 2002-06-17 Ralf Corsepius * Makefile.am: Merge src/Makefile.am. * configure.ac: Reflect changes above. * src/Makefile.am: Remove. --- c/src/exec/libcsupport/ChangeLog | 6 +++ c/src/exec/libcsupport/Makefile.am | 80 ++++++++++++++++++++++++++++-- c/src/exec/libcsupport/configure.ac | 3 +- c/src/exec/libcsupport/src/Makefile.am | 89 ---------------------------------- 4 files changed, 84 insertions(+), 94 deletions(-) delete mode 100644 c/src/exec/libcsupport/src/Makefile.am (limited to 'c/src/exec/libcsupport') diff --git a/c/src/exec/libcsupport/ChangeLog b/c/src/exec/libcsupport/ChangeLog index ad07546102..17da783ffe 100755 --- a/c/src/exec/libcsupport/ChangeLog +++ b/c/src/exec/libcsupport/ChangeLog @@ -1,3 +1,9 @@ +2002-06-17 Ralf Corsepius + + * Makefile.am: Merge src/Makefile.am. + * configure.ac: Reflect changes above. + * src/Makefile.am: Remove. + 2002-06-17 Ralf Corsepius * Makefile.am: Include $(top_srcdir)/../automake/*.am. diff --git a/c/src/exec/libcsupport/Makefile.am b/c/src/exec/libcsupport/Makefile.am index a21c7beb30..22cbad4233 100644 --- a/c/src/exec/libcsupport/Makefile.am +++ b/c/src/exec/libcsupport/Makefile.am @@ -5,8 +5,8 @@ ACLOCAL_AMFLAGS = -I ../aclocal include $(top_srcdir)/../automake/multilib.am - -SUBDIRS = . src +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/lib.am include_HEADERS = include/chain.h include/console.h include/clockdrv.h \ include/iosupp.h include/ringbuf.h include/rtc.h \ @@ -87,5 +87,79 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/zilog \ ## General stuff all-local: $(PREINSTALL_FILES) -include $(top_srcdir)/../automake/subdirs.am +LIBNAME = libcsupport +LIB = ${ARCH}/${LIBNAME}.a + +INCLUDES = -Isrc + +ERROR_C_FILES = src/error.c + +ASSOCIATION_C_FILES = src/assoc.c src/assocnamebad.c + +BASE_FS_C_FILES = src/base_fs.c src/mount.c src/unmount.c src/libio.c \ + src/libio_sockets.c src/eval.c src/fs_null_handlers.c src/privateenv.c + +TERMIOS_C_FILES = src/cfgetispeed.c src/cfgetospeed.c src/cfsetispeed.c src/cfsetospeed.c \ + src/tcgetattr.c src/tcsetattr.c src/tcdrain.c src/tcflow.c src/tcflush.c src/tcgetprgrp.c \ + src/tcsendbreak.c src/tcsetpgrp.c src/termios.c src/termiosinitialize.c \ + src/termiosreserveresources.c + +SYSTEM_CALL_C_FILES = src/open.c src/close.c src/read.c src/write.c src/lseek.c src/ioctl.c src/mkdir.c \ + src/mknod.c src/mkfifo.c src/rmdir.c src/chdir.c src/chmod.c src/fchdir.c src/fchmod.c src/chown.c \ + src/link.c src/unlink.c src/umask.c src/ftruncate.c src/utime.c src/fstat.c src/fcntl.c src/fpathconf.c \ + src/getdents.c src/fsync.c src/fdatasync.c src/pipe.c src/dup.c src/dup2.c src/symlink.c src/readlink.c \ + src/creat.c src/chroot.c + +DIRECTORY_SCAN_C_FILES = src/opendir.c src/closedir.c src/readdir.c src/rewinddir.c \ + src/scandir.c src/seekdir.c src/telldir.c src/getcwd.c + +MALLOC_C_FILES = src/malloc.c src/mallocfreespace.c src/__brk.c src/__sbrk.c + +PASSWORD_GROUP_C_FILES = src/getpwent.c src/getgrent.c + +TERMINAL_IDENTIFICATION_C_FILES = src/ctermid.c src/isatty.c src/ttyname.c src/ttyname_r.c + +LIBC_GLUE_C_FILES = src/__getpid.c src/__gettod.c src/__times.c src/truncate.c src/access.c \ + src/stat.c src/lstat.c src/pathconf.c src/newlibc.c src/no_posix.c src/no_libc.c src/utsname.c + +UNIX_LIBC_C_FILES = src/unixlibc.c src/hosterr.c + +COMMON_C_FILES = src/gxx_wrappers.c src/printk.c $(BASE_FS_C_FILES) \ + $(MALLOC_C_FILES) $(TERMIOS_C_FILES) $(ERROR_C_FILES) \ + $(ASSOCIATION_C_FILES) + +UNIX_C_FILES = $(UNIX_LIBC_C_FILES) + +EMBEDDED_C_FILES = $(LIBC_GLUE_C_FILES) $(PASSWORD_GROUP_C_FILES) \ + $(TERMINAL_IDENTIFICATION_C_FILES) $(SYSTEM_CALL_C_FILES) \ + $(DIRECTORY_SCAN_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:src/%.c=${ARCH}/%.o) +OBJS = $(C_O_FILES) + +# +# Add local stuff here using += +# + +AM_CFLAGS += $(LIBC_DEFINES) + +all-local: ${ARCH} ${LIB} + +${ARCH}/%.o: src/%.c + ${COMPILE} -o $@ -c $< + +$(LIB): ${OBJS} + $(make-library) + +DOC_FILES = TODO CASES + +EXTRA_DIST = $(DOC_FILES) $(COMMON_C_FILES) $(EMBEDDED_C_FILES) \ + $(UNIX_C_FILES) + include $(top_srcdir)/../automake/local.am diff --git a/c/src/exec/libcsupport/configure.ac b/c/src/exec/libcsupport/configure.ac index a49364774e..6f070bd088 100644 --- a/c/src/exec/libcsupport/configure.ac +++ b/c/src/exec/libcsupport/configure.ac @@ -31,6 +31,5 @@ AM_CONDITIONAL(NEWLIB,test x"$RTEMS_USE_NEWLIB" = x"yes") AM_CONFIG_HEADER(src/config.h) # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -src/Makefile]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/exec/libcsupport/src/Makefile.am b/c/src/exec/libcsupport/src/Makefile.am deleted file mode 100644 index 35b84626d4..0000000000 --- a/c/src/exec/libcsupport/src/Makefile.am +++ /dev/null @@ -1,89 +0,0 @@ -## -## $Id$ -## - -include $(top_srcdir)/../automake/multilib.am -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/lib.am - -LIBNAME = libcsupport -LIB = ${ARCH}/${LIBNAME}.a - -INCLUDES = -I. - -ERROR_C_FILES = error.c - -ASSOCIATION_C_FILES = assoc.c assocnamebad.c - -BASE_FS_C_FILES = base_fs.c mount.c unmount.c libio.c \ - libio_sockets.c eval.c fs_null_handlers.c privateenv.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 fchdir.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 chroot.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 mallocfreespace.c __brk.c __sbrk.c - -ENVIRON_C_FILES = - -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 envlock.c newlibc.c no_posix.c no_libc.c \ - utsname.c - -UNIX_LIBC_C_FILES = unixlibc.c hosterr.c - -COMMON_C_FILES = gxx_wrappers.c printk.c $(BASE_FS_C_FILES) \ - $(MALLOC_C_FILES) $(ENVIRON_C_FILES) $(TERMIOS_C_FILES) $(ERROR_C_FILES) \ - $(ASSOCIATION_C_FILES) - -UNIX_C_FILES = $(UNIX_LIBC_C_FILES) - -EMBEDDED_C_FILES = $(LIBC_GLUE_C_FILES) $(PASSWORD_GROUP_C_FILES) \ - $(TERMINAL_IDENTIFICATION_C_FILES) $(SYSTEM_CALL_C_FILES) \ - $(DIRECTORY_SCAN_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) - -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a - -OBJS = $(C_O_FILES) - -# -# Add local stuff here using += -# - -AM_CFLAGS += $(LIBC_DEFINES) - -all-local: ${ARCH} $(TMPINSTALL_FILES) - -$(LIB): ${OBJS} - $(make-library) - -$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) - $(INSTALL_DATA) $< $@ - -DOC_FILES = TODO CASES - -EXTRA_DIST = $(DOC_FILES) $(COMMON_C_FILES) $(EMBEDDED_C_FILES) \ - $(UNIX_C_FILES) - -include $(top_srcdir)/../automake/local.am -- cgit v1.2.3