From 2532817c28646928544cd10d338eeaa9415c8039 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Thu, 13 Sep 2018 14:46:30 +0200
Subject: build: Merge libcsupport/Makefile.am

---
 cpukit/Makefile.am             | 196 ++++++++++++++++++++++++++++++++++++++++-
 cpukit/configure.ac            |   1 -
 cpukit/libcsupport/Makefile.am | 134 ----------------------------
 cpukit/wrapup/Makefile.am      |   2 -
 4 files changed, 195 insertions(+), 138 deletions(-)
 delete mode 100644 cpukit/libcsupport/Makefile.am

(limited to 'cpukit')

diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index eb8e888b72..bf8b2c2206 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -66,6 +66,200 @@ libcpukit_a_SOURCES += libcrypt/crypt-md5.c
 libcpukit_a_SOURCES += libcrypt/crypt-sha256.c
 libcpukit_a_SOURCES += libcrypt/crypt-sha512.c
 libcpukit_a_SOURCES += libcrypt/misc.c
+libcpukit_a_SOURCES += libcsupport/src/access.c
+libcpukit_a_SOURCES += libcsupport/src/arc4random_getentropy_fail.c
+libcpukit_a_SOURCES += libcsupport/src/__assert.c
+libcpukit_a_SOURCES += libcsupport/src/assoc32tostring.c
+libcpukit_a_SOURCES += libcsupport/src/assoclocalbyname.c
+libcpukit_a_SOURCES += libcsupport/src/assoclocalbyremotebitfield.c
+libcpukit_a_SOURCES += libcsupport/src/assoclocalbyremote.c
+libcpukit_a_SOURCES += libcsupport/src/assocnamebad.c
+libcpukit_a_SOURCES += libcsupport/src/assocnamebylocalbitfield.c
+libcpukit_a_SOURCES += libcsupport/src/assocnamebylocal.c
+libcpukit_a_SOURCES += libcsupport/src/assocnamebyremotebitfield.c
+libcpukit_a_SOURCES += libcsupport/src/assocnamebyremote.c
+libcpukit_a_SOURCES += libcsupport/src/assocptrbylocal.c
+libcpukit_a_SOURCES += libcsupport/src/assocptrbyname.c
+libcpukit_a_SOURCES += libcsupport/src/assocptrbyremote.c
+libcpukit_a_SOURCES += libcsupport/src/assocremotebylocalbitfield.c
+libcpukit_a_SOURCES += libcsupport/src/assocremotebylocal.c
+libcpukit_a_SOURCES += libcsupport/src/assocremotebyname.c
+libcpukit_a_SOURCES += libcsupport/src/assocthreadstatestostring.c
+libcpukit_a_SOURCES += libcsupport/src/base_fs.c
+libcpukit_a_SOURCES += libcsupport/src/cachealignedalloc.c
+libcpukit_a_SOURCES += libcsupport/src/cachecoherentalloc.c
+libcpukit_a_SOURCES += libcsupport/src/calloc.c
+libcpukit_a_SOURCES += libcsupport/src/_calloc_r.c
+libcpukit_a_SOURCES += libcsupport/src/cfgetispeed.c
+libcpukit_a_SOURCES += libcsupport/src/cfgetospeed.c
+libcpukit_a_SOURCES += libcsupport/src/cfmakeraw.c
+libcpukit_a_SOURCES += libcsupport/src/cfmakesane.c
+libcpukit_a_SOURCES += libcsupport/src/cfsetispeed.c
+libcpukit_a_SOURCES += libcsupport/src/cfsetospeed.c
+libcpukit_a_SOURCES += libcsupport/src/cfsetspeed.c
+libcpukit_a_SOURCES += libcsupport/src/chdir.c
+libcpukit_a_SOURCES += libcsupport/src/chmod.c
+libcpukit_a_SOURCES += libcsupport/src/chown.c
+libcpukit_a_SOURCES += libcsupport/src/chroot.c
+libcpukit_a_SOURCES += libcsupport/src/clock.c
+libcpukit_a_SOURCES += libcsupport/src/clonenode.c
+libcpukit_a_SOURCES += libcsupport/src/close.c
+libcpukit_a_SOURCES += libcsupport/src/consolesimple.c
+libcpukit_a_SOURCES += libcsupport/src/consolesimpleread.c
+libcpukit_a_SOURCES += libcsupport/src/consolesimpletask.c
+libcpukit_a_SOURCES += libcsupport/src/ctermid.c
+libcpukit_a_SOURCES += libcsupport/src/dup2.c
+libcpukit_a_SOURCES += libcsupport/src/dup.c
+libcpukit_a_SOURCES += libcsupport/src/error.c
+libcpukit_a_SOURCES += libcsupport/src/fchdir.c
+libcpukit_a_SOURCES += libcsupport/src/fchmod.c
+libcpukit_a_SOURCES += libcsupport/src/fchown.c
+libcpukit_a_SOURCES += libcsupport/src/fcntl.c
+libcpukit_a_SOURCES += libcsupport/src/fdatasync.c
+libcpukit_a_SOURCES += libcsupport/src/flockfile.c
+libcpukit_a_SOURCES += libcsupport/src/fpathconf.c
+libcpukit_a_SOURCES += libcsupport/src/free.c
+libcpukit_a_SOURCES += libcsupport/src/freenode.c
+libcpukit_a_SOURCES += libcsupport/src/_free_r.c
+libcpukit_a_SOURCES += libcsupport/src/fstat.c
+libcpukit_a_SOURCES += libcsupport/src/fsync.c
+libcpukit_a_SOURCES += libcsupport/src/ftruncate.c
+libcpukit_a_SOURCES += libcsupport/src/ftrylockfile.c
+libcpukit_a_SOURCES += libcsupport/src/funlockfile.c
+libcpukit_a_SOURCES += libcsupport/src/getchark.c
+libcpukit_a_SOURCES += libcsupport/src/getcwd.c
+libcpukit_a_SOURCES += libcsupport/src/getdents.c
+libcpukit_a_SOURCES += libcsupport/src/getegid.c
+libcpukit_a_SOURCES += libcsupport/src/geteuid.c
+libcpukit_a_SOURCES += libcsupport/src/getgid.c
+libcpukit_a_SOURCES += libcsupport/src/getgrent.c
+libcpukit_a_SOURCES += libcsupport/src/getgrnam.c
+libcpukit_a_SOURCES += libcsupport/src/getgroups.c
+libcpukit_a_SOURCES += libcsupport/src/getlogin.c
+libcpukit_a_SOURCES += libcsupport/src/getpagesize.c
+libcpukit_a_SOURCES += libcsupport/src/getpgrp.c
+libcpukit_a_SOURCES += libcsupport/src/__getpid.c
+libcpukit_a_SOURCES += libcsupport/src/getpid.c
+libcpukit_a_SOURCES += libcsupport/src/getppid.c
+libcpukit_a_SOURCES += libcsupport/src/getpwent.c
+libcpukit_a_SOURCES += libcsupport/src/getrusage.c
+libcpukit_a_SOURCES += libcsupport/src/__gettod.c
+libcpukit_a_SOURCES += libcsupport/src/getuid.c
+libcpukit_a_SOURCES += libcsupport/src/gxx_wrappers.c
+libcpukit_a_SOURCES += libcsupport/src/ioctl.c
+libcpukit_a_SOURCES += libcsupport/src/isatty.c
+libcpukit_a_SOURCES += libcsupport/src/isatty_r.c
+libcpukit_a_SOURCES += libcsupport/src/issetugid.c
+libcpukit_a_SOURCES += libcsupport/src/kill_noposix.c
+libcpukit_a_SOURCES += libcsupport/src/lchown.c
+libcpukit_a_SOURCES += libcsupport/src/libio.c
+libcpukit_a_SOURCES += libcsupport/src/libio_exit.c
+libcpukit_a_SOURCES += libcsupport/src/libio_init.c
+libcpukit_a_SOURCES += libcsupport/src/link.c
+libcpukit_a_SOURCES += libcsupport/src/lseek.c
+libcpukit_a_SOURCES += libcsupport/src/lstat.c
+libcpukit_a_SOURCES += libcsupport/src/malloc.c
+libcpukit_a_SOURCES += libcsupport/src/malloc_deferred.c
+libcpukit_a_SOURCES += libcsupport/src/malloc_dirtier.c
+libcpukit_a_SOURCES += libcsupport/src/mallocfreespace.c
+libcpukit_a_SOURCES += libcsupport/src/mallocgetheapptr.c
+libcpukit_a_SOURCES += libcsupport/src/mallocinfo.c
+libcpukit_a_SOURCES += libcsupport/src/malloc_initialize.c
+libcpukit_a_SOURCES += libcsupport/src/_malloc_r.c
+libcpukit_a_SOURCES += libcsupport/src/mallocsetheapptr.c
+libcpukit_a_SOURCES += libcsupport/src/malloc_walk.c
+libcpukit_a_SOURCES += libcsupport/src/mkdir.c
+libcpukit_a_SOURCES += libcsupport/src/mkfifo.c
+libcpukit_a_SOURCES += libcsupport/src/mknod.c
+libcpukit_a_SOURCES += libcsupport/src/mount.c
+libcpukit_a_SOURCES += libcsupport/src/mount-mgr.c
+libcpukit_a_SOURCES += libcsupport/src/mount-mktgt.c
+libcpukit_a_SOURCES += libcsupport/src/newlibc_exit.c
+libcpukit_a_SOURCES += libcsupport/src/newlibc_reent.c
+libcpukit_a_SOURCES += libcsupport/src/open.c
+libcpukit_a_SOURCES += libcsupport/src/open_dev_console.c
+libcpukit_a_SOURCES += libcsupport/src/pathconf.c
+libcpukit_a_SOURCES += libcsupport/src/posix_devctl.c
+libcpukit_a_SOURCES += libcsupport/src/posix_memalign.c
+libcpukit_a_SOURCES += libcsupport/src/printerfprintfputc.c
+libcpukit_a_SOURCES += libcsupport/src/printertask.c
+libcpukit_a_SOURCES += libcsupport/src/printf_plugin.c
+libcpukit_a_SOURCES += libcsupport/src/print_fprintf.c
+libcpukit_a_SOURCES += libcsupport/src/printk.c
+libcpukit_a_SOURCES += libcsupport/src/printk_plugin.c
+libcpukit_a_SOURCES += libcsupport/src/print_printf.c
+libcpukit_a_SOURCES += libcsupport/src/privateenv.c
+libcpukit_a_SOURCES += libcsupport/src/putk.c
+libcpukit_a_SOURCES += libcsupport/src/pwdgrp.c
+libcpukit_a_SOURCES += libcsupport/src/read.c
+libcpukit_a_SOURCES += libcsupport/src/readdir_r.c
+libcpukit_a_SOURCES += libcsupport/src/readlink.c
+libcpukit_a_SOURCES += libcsupport/src/readv.c
+libcpukit_a_SOURCES += libcsupport/src/realloc.c
+libcpukit_a_SOURCES += libcsupport/src/_realloc_r.c
+libcpukit_a_SOURCES += libcsupport/src/realpath.c
+libcpukit_a_SOURCES += libcsupport/src/_rename_r.c
+libcpukit_a_SOURCES += libcsupport/src/resource_snapshot.c
+libcpukit_a_SOURCES += libcsupport/src/rmdir.c
+libcpukit_a_SOURCES += libcsupport/src/rtems_heap_extend.c
+libcpukit_a_SOURCES += libcsupport/src/rtems_heap_extend_via_sbrk.c
+libcpukit_a_SOURCES += libcsupport/src/rtems_heap_greedy.c
+libcpukit_a_SOURCES += libcsupport/src/rtems_heap_null_extend.c
+libcpukit_a_SOURCES += libcsupport/src/rtems_memalign.c
+libcpukit_a_SOURCES += libcsupport/src/rtems_mkdir.c
+libcpukit_a_SOURCES += libcsupport/src/rtems_putc.c
+libcpukit_a_SOURCES += libcsupport/src/setegid.c
+libcpukit_a_SOURCES += libcsupport/src/seteuid.c
+libcpukit_a_SOURCES += libcsupport/src/setgid.c
+libcpukit_a_SOURCES += libcsupport/src/setgroups.c
+libcpukit_a_SOURCES += libcsupport/src/setpgid.c
+libcpukit_a_SOURCES += libcsupport/src/setsid.c
+libcpukit_a_SOURCES += libcsupport/src/setuid.c
+libcpukit_a_SOURCES += libcsupport/src/stat.c
+libcpukit_a_SOURCES += libcsupport/src/statvfs.c
+libcpukit_a_SOURCES += libcsupport/src/strlcat.c
+libcpukit_a_SOURCES += libcsupport/src/strlcpy.c
+libcpukit_a_SOURCES += libcsupport/src/sup_fs_check_permissions.c
+libcpukit_a_SOURCES += libcsupport/src/sup_fs_deviceio.c
+libcpukit_a_SOURCES += libcsupport/src/sup_fs_eval_path.c
+libcpukit_a_SOURCES += libcsupport/src/sup_fs_eval_path_generic.c
+libcpukit_a_SOURCES += libcsupport/src/sup_fs_exist_in_same_instance.c
+libcpukit_a_SOURCES += libcsupport/src/sup_fs_location.c
+libcpukit_a_SOURCES += libcsupport/src/sup_fs_mount_iterate.c
+libcpukit_a_SOURCES += libcsupport/src/sup_fs_next_token.c
+libcpukit_a_SOURCES += libcsupport/src/symlink.c
+libcpukit_a_SOURCES += libcsupport/src/sync.c
+libcpukit_a_SOURCES += libcsupport/src/tcdrain.c
+libcpukit_a_SOURCES += libcsupport/src/tcflow.c
+libcpukit_a_SOURCES += libcsupport/src/tcflush.c
+libcpukit_a_SOURCES += libcsupport/src/tcgetattr.c
+libcpukit_a_SOURCES += libcsupport/src/tcgetpgrp.c
+libcpukit_a_SOURCES += libcsupport/src/tcsendbreak.c
+libcpukit_a_SOURCES += libcsupport/src/tcsetattr.c
+libcpukit_a_SOURCES += libcsupport/src/tcsetpgrp.c
+libcpukit_a_SOURCES += libcsupport/src/termios_baud2index.c
+libcpukit_a_SOURCES += libcsupport/src/termios_baud2num.c
+libcpukit_a_SOURCES += libcsupport/src/termios_baudtable.c
+libcpukit_a_SOURCES += libcsupport/src/termios.c
+libcpukit_a_SOURCES += libcsupport/src/termiosinitialize.c
+libcpukit_a_SOURCES += libcsupport/src/termios_num2baud.c
+libcpukit_a_SOURCES += libcsupport/src/termios_setbestbaud.c
+libcpukit_a_SOURCES += libcsupport/src/termios_setinitialbaud.c
+libcpukit_a_SOURCES += libcsupport/src/__times.c
+libcpukit_a_SOURCES += libcsupport/src/truncate.c
+libcpukit_a_SOURCES += libcsupport/src/ttyname.c
+libcpukit_a_SOURCES += libcsupport/src/uenvgetgroups.c
+libcpukit_a_SOURCES += libcsupport/src/umask.c
+libcpukit_a_SOURCES += libcsupport/src/unlink.c
+libcpukit_a_SOURCES += libcsupport/src/unmount.c
+libcpukit_a_SOURCES += libcsupport/src/__usrenv.c
+libcpukit_a_SOURCES += libcsupport/src/utime.c
+libcpukit_a_SOURCES += libcsupport/src/utimes.c
+libcpukit_a_SOURCES += libcsupport/src/utsname.c
+libcpukit_a_SOURCES += libcsupport/src/vprintk.c
+libcpukit_a_SOURCES += libcsupport/src/write.c
+libcpukit_a_SOURCES += libcsupport/src/write_r.c
+libcpukit_a_SOURCES += libcsupport/src/writev.c
 libcpukit_a_SOURCES += sapi/src/chainappendnotify.c
 libcpukit_a_SOURCES += sapi/src/chaingetnotify.c
 libcpukit_a_SOURCES += sapi/src/chaingetwait.c
@@ -139,7 +333,7 @@ all-local: generate-vc-key
 
 # librtemscpu
 _SUBDIRS = . score rtems posix
-_SUBDIRS += libcsupport libfs
+_SUBDIRS += libfs
 _SUBDIRS += libdrvmgr
 _SUBDIRS += libnetworking librpc
 _SUBDIRS += libpci
diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index c916d8d3fc..5c1efa0860 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -501,7 +501,6 @@ libdrvmgr/Makefile
 libfs/Makefile
 libfs/src/nfsclient/Makefile
 libgnat/Makefile
-libcsupport/Makefile
 libnetworking/Makefile
 libpci/Makefile
 librpc/Makefile
diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am
deleted file mode 100644
index 00bbdfc9b9..0000000000
--- a/cpukit/libcsupport/Makefile.am
+++ /dev/null
@@ -1,134 +0,0 @@
-include $(top_srcdir)/automake/multilib.am
-include $(top_srcdir)/automake/compile.am
-
-noinst_LIBRARIES = libcsupport.a libcalloc.a
-
-## rtems
-##  General stuff
-ERROR_C_FILES = src/error.c src/__assert.c
-
-ASSOCIATION_C_FILES = src/assoclocalbyname.c \
-    src/assoclocalbyremotebitfield.c src/assoclocalbyremote.c \
-    src/assocnamebad.c src/assocnamebylocalbitfield.c \
-    src/assocnamebylocal.c src/assocnamebyremotebitfield.c \
-    src/assocnamebyremote.c src/assocptrbylocal.c src/assocptrbyname.c \
-    src/assocptrbyremote.c src/assocremotebylocalbitfield.c \
-    src/assocremotebylocal.c src/assocremotebyname.c
-ASSOCIATION_C_FILES += src/assoc32tostring.c
-ASSOCIATION_C_FILES += src/assocthreadstatestostring.c
-
-BASE_FS_C_FILES = src/base_fs.c src/mount.c src/unmount.c src/libio.c \
-    src/mount-mgr.c src/mount-mktgt.c src/libio_init.c \
-    src/privateenv.c \
-    src/libio_exit.c \
-    src/open_dev_console.c src/__usrenv.c src/rtems_mkdir.c
-BASE_FS_C_FILES += src/uenvgetgroups.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/tcgetpgrp.c src/tcsendbreak.c \
-    src/tcsetpgrp.c src/termios.c src/termiosinitialize.c \
-    src/termios_baud2index.c src/termios_baud2num.c src/termios_num2baud.c \
-    src/termios_setinitialbaud.c src/termios_baudtable.c src/cfsetspeed.c \
-    src/cfmakeraw.c src/cfmakesane.c src/termios_setbestbaud.c
-
-SYSTEM_CALL_C_FILES = src/open.c src/close.c src/read.c src/write.c \
-    src/write_r.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/fchown.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/dup.c src/dup2.c src/symlink.c src/readlink.c \
-    src/chroot.c src/sync.c src/_rename_r.c src/statvfs.c src/utimes.c src/lchown.c
-SYSTEM_CALL_C_FILES += src/clock.c
-
-## Until sys/uio.h is moved to libcsupport, we have to have networking
-## enabled to compile these.  Hopefully this is a temporary situation.
-if NEWLIB
-SYSTEM_CALL_C_FILES += src/readv.c src/writev.c
-endif
-
-DIRECTORY_SCAN_C_FILES =
-## Newlib SHOULD have provided this one
-DIRECTORY_SCAN_C_FILES += src/readdir_r.c
-## Comment out when using these from newlib's unix directory
-DIRECTORY_SCAN_C_FILES += src/getcwd.c
-
-ID_C_FILES = src/getegid.c src/geteuid.c src/getgid.c src/getgroups.c \
-    src/getlogin.c src/getpgrp.c src/getpid.c src/getppid.c src/getuid.c \
-    src/seteuid.c src/setgid.c src/setuid.c src/setegid.c src/setpgid.c \
-    src/setsid.c src/setgroups.c
-
-MALLOC_C_FILES = src/malloc_initialize.c src/malloc.c \
-    src/realloc.c src/_calloc_r.c src/_malloc_r.c \
-    src/free.c src/_free_r.c \
-    src/_realloc_r.c src/mallocfreespace.c \
-    src/mallocgetheapptr.c src/mallocsetheapptr.c \
-    src/mallocinfo.c src/malloc_walk.c \
-    src/posix_memalign.c \
-    src/rtems_memalign.c src/malloc_deferred.c \
-    src/malloc_dirtier.c src/malloc_p.h \
-    src/rtems_heap_extend_via_sbrk.c \
-    src/rtems_heap_null_extend.c \
-    src/rtems_heap_extend.c \
-    src/rtems_heap_greedy.c
-MALLOC_C_FILES += src/cachealignedalloc.c
-MALLOC_C_FILES += src/cachecoherentalloc.c
-
-PASSWORD_GROUP_C_FILES = src/pwdgrp.c
-PASSWORD_GROUP_C_FILES += src/getgrent.c
-PASSWORD_GROUP_C_FILES += src/getgrnam.c
-PASSWORD_GROUP_C_FILES += src/getpwent.c
-
-TERMINAL_IDENTIFICATION_C_FILES = src/ctermid.c
-## 20 Nov 2008: Now using these from newlib's posix directory
-TERMINAL_IDENTIFICATION_C_FILES += src/isatty.c src/isatty_r.c
-## Comment out when using these from newlib's unix directory
-TERMINAL_IDENTIFICATION_C_FILES += src/ttyname.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_reent.c src/newlibc_exit.c \
-    src/kill_noposix.c src/utsname.c src/realpath.c \
-    src/arc4random_getentropy_fail.c
-
-BSD_LIBC_C_FILES = src/strlcpy.c src/strlcat.c src/issetugid.c
-
-libcsupport_a_SOURCES = src/gxx_wrappers.c src/getchark.c src/printk.c \
-    src/printk_plugin.c src/putk.c src/vprintk.c \
-    src/rtems_putc.c \
-    src/print_fprintf.c \
-    src/print_printf.c \
-    src/printf_plugin.c \
-    src/sup_fs_location.c \
-    src/sup_fs_eval_path.c \
-    src/sup_fs_eval_path_generic.c \
-    src/sup_fs_check_permissions.c \
-    src/sup_fs_next_token.c \
-    src/sup_fs_exist_in_same_instance.c \
-    src/sup_fs_mount_iterate.c \
-    src/sup_fs_deviceio.c \
-    src/clonenode.c \
-    src/freenode.c \
-    src/resource_snapshot.c \
-    $(BSD_LIBC_C_FILES) $(BASE_FS_C_FILES) $(MALLOC_C_FILES) \
-    $(ERROR_C_FILES) $(ASSOCIATION_C_FILES)
-libcsupport_a_SOURCES += src/consolesimple.c
-libcsupport_a_SOURCES += src/consolesimpleread.c
-libcsupport_a_SOURCES += src/consolesimpletask.c
-libcsupport_a_SOURCES += src/printertask.c
-libcsupport_a_SOURCES += src/printerfprintfputc.c
-
-libcsupport_a_SOURCES += $(LIBC_GLUE_C_FILES) $(PASSWORD_GROUP_C_FILES) \
-    $(TERMINAL_IDENTIFICATION_C_FILES) $(SYSTEM_CALL_C_FILES) \
-    $(DIRECTORY_SCAN_C_FILES) $(ID_C_FILES) \
-    $(TERMIOS_C_FILES) src/getpagesize.c src/getrusage.c src/posix_devctl.c
-
-
-libcsupport_a_SOURCES += src/flockfile.c src/funlockfile.c src/ftrylockfile.c
-
-libcalloc_a_SOURCES = src/calloc.c
-libcalloc_a_CFLAGS = -fno-builtin
-
-
-include $(top_srcdir)/automake/local.am
diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am
index 924e53a1d7..41bc76316d 100644
--- a/cpukit/wrapup/Makefile.am
+++ b/cpukit/wrapup/Makefile.am
@@ -24,8 +24,6 @@ TMP_LIBS += ../libgnat/libgnat.a
 endif
 
 TMP_LIBS += ../libstdthreads/libstdthreads.a
-TMP_LIBS += ../libcsupport/libcsupport.a
-TMP_LIBS += ../libcsupport/libcalloc.a
 if LIBDOSFS
 TMP_LIBS += ../libfs/libdosfs.a
 endif
-- 
cgit v1.2.3