From c1b12e6a410830003ea663424a1a33ec1a8469fd Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 11 Oct 1999 18:31:48 +0000 Subject: Moved RTEMS error and association from libmisc to libc support to avoid cyclic dependencies generated when moving packages to the top level. --- c/src/lib/libc/Makefile.in | 12 +++++++++--- c/src/lib/libmisc/Makefile.am | 2 +- c/src/lib/libmisc/configure.in | 4 +--- c/src/lib/libmisc/wrapup/Makefile.in | 1 - c/src/libmisc/Makefile.am | 2 +- c/src/libmisc/configure.in | 4 +--- c/src/libmisc/wrapup/Makefile.in | 1 - 7 files changed, 13 insertions(+), 13 deletions(-) (limited to 'c') diff --git a/c/src/lib/libc/Makefile.in b/c/src/lib/libc/Makefile.in index 80f63beedd..c57d7ad305 100644 --- a/c/src/lib/libc/Makefile.in +++ b/c/src/lib/libc/Makefile.in @@ -16,6 +16,10 @@ 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 IMFS_C_PIECES = imfs_chown imfs_creat imfs_directory imfs_eval imfs_free \ @@ -47,11 +51,13 @@ 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) + $(TERMIOS_C_PIECES) $(ERROR_C_PIECES) $(ASSOCIATION_C_PIECES) EMBEDDED_C_PIECES = $(LIBC_GLUE_C_PIECES) $(BASE_FS_C_PIECES) \ $(MALLOC_C_PIECES) $(PASSWORD_GROUP_C_PIECES) $(TERMIOS_C_PIECES) \ - $(SYSTEM_CALL_C_PIECES) $(DIRECTORY_SCAN_C_PIECES) $(IMFS_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) @@ -60,7 +66,7 @@ C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) H_FILES = $(srcdir)/libcsupport.h SYS_H_FILES = -RTEMS_H_FILES = $(srcdir)/libio.h +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 diff --git a/c/src/lib/libmisc/Makefile.am b/c/src/lib/libmisc/Makefile.am index 693211a7d1..84f85738f8 100644 --- a/c/src/lib/libmisc/Makefile.am +++ b/c/src/lib/libmisc/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -SUBDIRS = assoc dumpbuf error stackchk monitor cpuuse rtmonuse untar wrapup +SUBDIRS = dumpbuf stackchk monitor cpuuse rtmonuse untar wrapup EXTRA_DIST = README diff --git a/c/src/lib/libmisc/configure.in b/c/src/lib/libmisc/configure.in index a618f568c5..eab7ab6016 100644 --- a/c/src/lib/libmisc/configure.in +++ b/c/src/lib/libmisc/configure.in @@ -3,7 +3,7 @@ dnl dnl $Id$ AC_PREREQ(2.13) -AC_INIT(assoc) +AC_INIT(dumpbuf) RTEMS_TOP(../../../..) AC_CONFIG_AUX_DIR(../../../..) @@ -34,10 +34,8 @@ RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) # Try to explicitly list a Makefile here AC_OUTPUT( Makefile -assoc/Makefile cpuuse/Makefile dumpbuf/Makefile -error/Makefile monitor/Makefile rtmonuse/Makefile stackchk/Makefile diff --git a/c/src/lib/libmisc/wrapup/Makefile.in b/c/src/lib/libmisc/wrapup/Makefile.in index 752c0d8bb0..b81fa4f653 100644 --- a/c/src/lib/libmisc/wrapup/Makefile.in +++ b/c/src/lib/libmisc/wrapup/Makefile.in @@ -23,7 +23,6 @@ INSTALL_CHANGE = @INSTALL_CHANGE@ # Using the wildcard on the Purify support makes sure it may not be there LIBS = ../monitor/$(ARCH)/libmonitor-tmp.a ../untar/$(ARCH)/libuntar-tmp.a \ - ../error/$(ARCH)/liberror-tmp.a ../assoc/$(ARCH)/libassoc-tmp.a \ ../stackchk/$(ARCH)/libstackchk-tmp.a ../cpuuse/$(ARCH)/libcpuuse-tmp.a \ ../rtmonuse/$(ARCH)/librtmonuse-tmp.a \ ../dumpbuf/$(ARCH)/libdumpbuf-tmp.a diff --git a/c/src/libmisc/Makefile.am b/c/src/libmisc/Makefile.am index 693211a7d1..84f85738f8 100644 --- a/c/src/libmisc/Makefile.am +++ b/c/src/libmisc/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -SUBDIRS = assoc dumpbuf error stackchk monitor cpuuse rtmonuse untar wrapup +SUBDIRS = dumpbuf stackchk monitor cpuuse rtmonuse untar wrapup EXTRA_DIST = README diff --git a/c/src/libmisc/configure.in b/c/src/libmisc/configure.in index a618f568c5..eab7ab6016 100644 --- a/c/src/libmisc/configure.in +++ b/c/src/libmisc/configure.in @@ -3,7 +3,7 @@ dnl dnl $Id$ AC_PREREQ(2.13) -AC_INIT(assoc) +AC_INIT(dumpbuf) RTEMS_TOP(../../../..) AC_CONFIG_AUX_DIR(../../../..) @@ -34,10 +34,8 @@ RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) # Try to explicitly list a Makefile here AC_OUTPUT( Makefile -assoc/Makefile cpuuse/Makefile dumpbuf/Makefile -error/Makefile monitor/Makefile rtmonuse/Makefile stackchk/Makefile diff --git a/c/src/libmisc/wrapup/Makefile.in b/c/src/libmisc/wrapup/Makefile.in index 752c0d8bb0..b81fa4f653 100644 --- a/c/src/libmisc/wrapup/Makefile.in +++ b/c/src/libmisc/wrapup/Makefile.in @@ -23,7 +23,6 @@ INSTALL_CHANGE = @INSTALL_CHANGE@ # Using the wildcard on the Purify support makes sure it may not be there LIBS = ../monitor/$(ARCH)/libmonitor-tmp.a ../untar/$(ARCH)/libuntar-tmp.a \ - ../error/$(ARCH)/liberror-tmp.a ../assoc/$(ARCH)/libassoc-tmp.a \ ../stackchk/$(ARCH)/libstackchk-tmp.a ../cpuuse/$(ARCH)/libcpuuse-tmp.a \ ../rtmonuse/$(ARCH)/librtmonuse-tmp.a \ ../dumpbuf/$(ARCH)/libdumpbuf-tmp.a -- cgit v1.2.3