Changeset 70810dc in rtems for c/src/libmisc


Ignore:
Timestamp:
Feb 8, 2000, 10:33:25 PM (21 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
fb196c3c
Parents:
a976681e
Message:

Patches rtems-rc-20000204-0.diff from Ralf Corsepius <corsepiu@…>
that contains:

  • Removes remaining (now illegal) references to $(SRC) from a couple of Makefile.ams
  • Removes duplicate AC_CONFIG_SUBDIRS macro from c/configure.in
  • Moves ENABLE_LIBCDIR into RTEMS_PROG_C[C|XX]_FOR_TARGET (hides LIBCDIR from most configure scripts, i.e. LIBCDIR becomes less visible)
  • Adds RTEMS_PROG_C[C|XX]_FOR_TARGET and RTEMS_CANONICALIZE_TOOLS to libbsp/*/configure.ins (A minor bug in previous implementations, which only has an impact when switching to GNU/Cygnus canonicalization)
  • Cleans up several bogus comments.
  • Removes MKLIB
  • Switches the version number to 4.5.0 (for testing version number handling)
Location:
c/src/libmisc
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • c/src/libmisc/configure.in

    ra976681e r70810dc  
    1414
    1515RTEMS_ENABLE_MULTIPROCESSING
    16 RTEMS_ENABLE_LIBCDIR
    1716RTEMS_ENABLE_BARE
    1817
     
    2423RTEMS_PROJECT_ROOT
    2524
    26 dnl check target cc
    2725RTEMS_PROG_CC_FOR_TARGET
    2826RTEMS_CANONICALIZE_TOOLS
     
    3331AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
    3432
    35 # Try to explicitly list a Makefile here
     33# Explicitly list all Makefiles here
    3634AC_OUTPUT(
    3735Makefile
  • c/src/libmisc/cpuuse/Makefile.am

    ra976681e r70810dc  
    1 ##
    2 ##  $Id$
    3 ##
     1## 
     2## $Id$
     3## 
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    77LIBNAME = libcpuuse-tmp
    8 LIB = ${ARCH}/${LIBNAME}.a
     8LIB = $(ARCH)/$(LIBNAME).a
    99
    1010C_FILES = cpuuse.c
    11 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
     11C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
    1212
    1313H_FILES = cpuuse.h
    14 noinst_HEADERS = $(H_FILES)
    1514
    16 SRCS = $(C_FILES) $(H_FILES)
    1715OBJS = $(C_O_FILES)
    1816
    1917include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    20 include $(RTEMS_ROOT)/make/lib.cfg
    21 
    22 PREINSTALL_FILES = \
    23 $(PROJECT_INCLUDE)/rtems \
    24 $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
     18include $(top_srcdir)/../../../automake/lib.am
    2519
    2620$(PROJECT_INCLUDE)/rtems:
     
    3327#
    3428
    35 ${LIB}: ${OBJS}
     29$(LIB): $(OBJS)
    3630        $(make-library)
    3731
    38 all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
     32PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
     33    $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
    3934
    40 EXTRA_DIST += $(C_FILES)
     35all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
     36
     37.PRECIOUS: $(LIB)
     38
     39EXTRA_DIST = README cpuuse.c cpuuse.h
    4140
    4241include $(top_srcdir)/../../../automake/local.am
  • c/src/libmisc/monitor/Makefile.am

    ra976681e r70810dc  
    1 ##
    2 ##  $Id$
    3 ##
     1## 
     2## $Id$
     3## 
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    77LIBNAME = libmonitor-tmp
    8 LIB = ${ARCH}/$(LIBNAME).a
     8LIB = $(ARCH)/$(LIBNAME).a
    99
    1010# We only build multiprocessing related files if HAS_MP was defined
     
    1616
    1717if HAS_MP
    18 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) $(MP_C_FILES:%.c=${ARCH}/%.o)
     18C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) $(MP_C_FILES:%.c=$(ARCH)/%.o)
    1919else
    20 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
     20C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
    2121endif
    2222
    2323H_FILES = monitor.h symbols.h
    24 noinst_HEADERS = $(H_FILES)
    2524
    26 SRCS = README $(C_FILES) $(H_FILES)
    2725OBJS = $(C_O_FILES)
    2826
    2927include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    30 include $(RTEMS_ROOT)/make/lib.cfg
    31 
    32 PREINSTALL_FILES = \
    33 $(PROJECT_INCLUDE)/rtems \
    34 $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
     28include $(top_srcdir)/../../../automake/lib.am
    3529
    3630$(PROJECT_INCLUDE)/rtems:
     
    4337#
    4438
    45 ${LIB}: ${OBJS}
     39$(LIB): $(OBJS)
    4640        $(make-library)
    4741
    48 all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
     42PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
     43    $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
    4944
    50 EXTRA_DIST += $(C_FILES) $(MP_C_FILES)
     45all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
     46
     47.PRECIOUS: $(LIB)
     48
     49EXTRA_DIST = README mon-command.c mon-config.c mon-dname.c mon-driver.c \
     50    mon-extension.c mon-itask.c mon-manager.c mon-monitor.c mon-mpci.c \
     51    mon-object.c mon-prmisc.c mon-queue.c mon-server.c mon-symbols.c \
     52    mon-task.c monitor.h symbols.h
    5153
    5254include $(top_srcdir)/../../../automake/local.am
  • c/src/libmisc/rtmonuse/Makefile.am

    ra976681e r70810dc  
    1 ##
    2 ##  $Id$
    3 ##
     1## 
     2## $Id$
     3## 
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    77LIBNAME = librtmonuse-tmp
    8 LIB = ${ARCH}/${LIBNAME}.a
     8LIB = $(ARCH)/$(LIBNAME).a
    99
    1010C_FILES = rtmonuse.c
    11 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
     11C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
    1212
    1313H_FILES = rtmonuse.h
    14 noinst_HEADERS = $(H_FILES)
    1514
    16 SRCS = $(C_FILES) $(H_FILES)
    1715OBJS = $(C_O_FILES)
    1816
    1917include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    20 include $(RTEMS_ROOT)/make/lib.cfg
    21 
    22 PREINSTALL_FILES = \
    23 $(PROJECT_INCLUDE)/rtems \
    24 $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
     18include $(top_srcdir)/../../../automake/lib.am
    2519
    2620$(PROJECT_INCLUDE)/rtems:
     
    3327#
    3428
    35 ${LIB}: ${OBJS}
     29$(LIB): $(OBJS)
    3630        $(make-library)
    3731
    38 all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
     32PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
     33    $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
    3934
    40 EXTRA_DIST += $(C_FILES)
     35all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
     36
     37.PRECIOUS: $(LIB)
     38
     39EXTRA_DIST = rtmonuse.c rtmonuse.h
    4140
    4241include $(top_srcdir)/../../../automake/local.am
  • c/src/libmisc/stackchk/Makefile.am

    ra976681e r70810dc  
    1 ##
    2 ##  $Id$
    3 ##
     1## 
     2## $Id$
     3## 
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    77LIBNAME = libstackchk-tmp
    8 LIB = ${ARCH}/${LIBNAME}.a
     8LIB = $(ARCH)/$(LIBNAME).a
    99
    1010C_FILES = check.c
    11 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
     11C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
    1212
    1313H_FILES = internal.h
    1414INSTALLED_H_FILES = stackchk.h
    15 noinst_HEADERS = $(H_FILES) $(INSTALLED_H_FILES)
    1615
    17 SRCS = $(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
    1816OBJS = $(C_O_FILES)
    1917
    2018include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    21 include $(RTEMS_ROOT)/make/lib.cfg
    22 
    23 PREINSTALL_FILES = \
    24 $(PROJECT_INCLUDE)/rtems \
    25 $(INSTALLED_H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
     19include $(top_srcdir)/../../../automake/lib.am
    2620
    2721$(PROJECT_INCLUDE)/rtems:
     
    3428#
    3529
    36 ${LIB}: ${OBJS}
     30$(LIB): $(OBJS)
    3731        $(make-library)
    3832
    39 all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
     33PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
     34    $(INSTALLED_H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
    4035
    41 EXTRA_DIST += $(C_FILES)
     36all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
     37
     38.PRECIOUS: $(LIB)
     39
     40EXTRA_DIST = README check.c internal.h stackchk.h
    4241
    4342include $(top_srcdir)/../../../automake/local.am
  • c/src/libmisc/untar/Makefile.am

    ra976681e r70810dc  
    1 ##
    2 ##  $Id$
    3 ##
     1## 
     2## $Id$
     3## 
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    77LIBNAME = libuntar-tmp
    8 LIB = ${ARCH}/${LIBNAME}.a
     8LIB = $(ARCH)/$(LIBNAME).a
    99
    1010C_FILES = untar.c
    11 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
     11C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
    1212
    1313H_FILES = untar.h
    14 noinst_HEADERS = $(H_FILES)
    1514
    16 SRCS = $(C_FILES) $(H_FILES)
    1715OBJS = $(C_O_FILES)
    1816
    1917include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    20 include $(RTEMS_ROOT)/make/lib.cfg
    21 
    22 PREINSTALL_FILES = \
    23 $(PROJECT_INCLUDE)/rtems \
    24 $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
     18include $(top_srcdir)/../../../automake/lib.am
    2519
    2620$(PROJECT_INCLUDE)/rtems:
     
    3327#
    3428
    35 ${LIB}: ${OBJS}
     29$(LIB): $(OBJS)
    3630        $(make-library)
    3731
    38 all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
     32PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
     33    $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
    3934
    40 EXTRA_DIST += $(C_FILES)
     35all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
     36
     37.PRECIOUS: $(LIB)
     38
     39EXTRA_DIST = README untar.c untar.h
    4140
    4241include $(top_srcdir)/../../../automake/local.am
  • c/src/libmisc/wrapup/Makefile.am

    ra976681e r70810dc  
    1 ##
    2 ##  $Id$
    3 ##
     1## 
     2## $Id$
     3## 
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    77LIBNAME = libmisc
    8 LIB = ${ARCH}/$(LIBNAME).a
     8LIB = $(ARCH)/$(LIBNAME).a
    99
    1010include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    1111include $(top_srcdir)/../../../automake/lib.am
    1212
    13 TMP_LIBS = ../monitor/$(ARCH)/libmonitor-tmp.a ../untar/$(ARCH)/libuntar-tmp.a \
    14     ../stackchk/$(ARCH)/libstackchk-tmp.a ../cpuuse/$(ARCH)/libcpuuse-tmp.a \
    15     ../rtmonuse/$(ARCH)/librtmonuse-tmp.a \
     13TMP_LIBS = ../monitor/$(ARCH)/libmonitor-tmp.a \
     14    ../untar/$(ARCH)/libuntar-tmp.a ../stackchk/$(ARCH)/libstackchk-tmp.a \
     15    ../cpuuse/$(ARCH)/libcpuuse-tmp.a ../rtmonuse/$(ARCH)/librtmonuse-tmp.a \
    1616    ../dumpbuf/$(ARCH)/libdumpbuf-tmp.a
    17 
    18 TMPINSTALL_FILES += \
    19 $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
    2017
    2118$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
     
    3027        $(RM) -r $(ARCH)
    3128        mkdir $(ARCH)
    32         cd $(ARCH); for lib in $^; do \
    33                          $(AR) -xv ../$$lib; \
    34                     done
     29        cd $(ARCH); for lib in $^; do $(AR) -xv ../$$lib; done
    3530        $(AR) ruv $@ $(ARCH)/*
    3631        $(RANLIB) $@
    3732
    38 all: ${ARCH} $(LIB) $(TMPINSTALL_FILES)
     33TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
     34
     35all-local: $(ARCH) $(LIB) $(TMPINSTALL_FILES)
     36
     37.PRECIOUS: $(LIB)
    3938
    4039include $(top_srcdir)/../../../automake/local.am
Note: See TracChangeset for help on using the changeset viewer.