Changeset db3e0108 in rtems


Ignore:
Timestamp:
Dec 21, 1999, 2:32:00 PM (20 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
0fe48346
Parents:
8b91282
Message:

Patch rtems-rc-19991203-6.diff from Ralf Corsepius <corsepiu@…>
which fixes a nasty dependency bug in optman/Makefile.am. Those
directories have been build twice before, i.e. re-running make after
having built rtems before, was rebuilding the files in optman/
directories.

To apply:

patch -p1 < rtems-rc-19991203-6.diff
./bootstrap

Location:
c/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • c/src/exec/posix/optman/Makefile.am

    r8b91282 rdb3e0108  
    66
    77C_FILES =
    8 H_FILES =
    9 
    108C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
    11 
    12 SRCS = $(C_FILES)
    13 OBJS = $(C_O_FILES)
    149
    1510PGMS = $(C_FILES:%.c=$(ARCH)/%.rel)
    1611
    1712include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    18 include $(RTEMS_ROOT)/make/leaf.cfg
     13include $(top_srcdir)/../../../../automake/lib.am
     14
     15TMPINSTALL_FILES += \
     16$(C_FILES:%.c=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel)
     17
     18$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
     19        $(INSTALL_DATA) $< $@
     20
     21#
     22# (OPTIONAL) Add local stuff here using +=
     23#
    1924
    2025AM_CFLAGS += $(CFLAGS_OS_V)
     26ASM4FLAGS += -I$(PROJECT_INCLUDE)/rtems
     27
     28all-local: ${ARCH} $(PGMS) $(TMPINSTALL_FILES)
     29
     30.PRECIOUS: $(PGMS)
     31
     32EXTRA_DIST = $(C_FILES)
    2133
    2234include $(top_srcdir)/../../../../automake/local.am
  • c/src/exec/rtems/optman/Makefile.am

    r8b91282 rdb3e0108  
    88    no-rtmon.c no-sem.c no-signal.c no-timer.c
    99C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
    10 
    11 SRCS = $(C_FILES)
    12 OBJS = $(C_O_FILES)
    1310
    1411PGMS = $(C_FILES:%.c=$(ARCH)/%.rel)
     
    3027ASM4FLAGS += -I$(PROJECT_INCLUDE)/rtems
    3128
    32 all: ${ARCH} $(PGMS) $(TMPINSTALL_FILES)
     29all-local: ${ARCH} $(PGMS) $(TMPINSTALL_FILES)
     30
     31.PRECIOUS: $(PGMS)
    3332
    3433EXTRA_DIST = $(C_FILES)
  • c/src/exec/sapi/optman/Makefile.am

    r8b91282 rdb3e0108  
    88C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
    99
    10 SRCS = $(C_FILES)
    11 OBJS = $(C_O_FILES)
    12 
    13 PGMNAME = $(C_FILES:%.c=%)
    1410PGMS = $(C_FILES:%.c=$(ARCH)/%.rel)
    1511
    1612include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    17 include $(RTEMS_ROOT)/make/leaf.cfg
     13include $(top_srcdir)/../../../automake/lib.am
    1814
    19 TMPINSTALL_FILES = \
    20 $(PROJECT_RELEASE)/lib \
    21 $(PGMNAME:%=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel)
     15TMPINSTALL_FILES += \
     16$(C_FILES:%.c=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel)
     17
     18$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
     19        $(INSTALL_DATA) $< $@
    2220
    2321#
     
    2826ASM4FLAGS += -I $(PROJECT_INCLUDE)/rtems
    2927
    30 $(PROJECT_RELEASE)/lib:
    31         $(mkinstalldirs) $@
    32 $(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
    33         $(INSTALL_DATA) $< $@
     28all-local: ${ARCH} $(PGMS) $(TMPINSTALL_FILES)
    3429
    35 all: ${ARCH} $(PGMS) $(TMPINSTALL_FILES)
     30.PRECIOUS: $(PGMS)
    3631
    3732EXTRA_DIST = $(C_FILES)
  • c/src/optman/rtems/Makefile.am

    r8b91282 rdb3e0108  
    88    no-rtmon.c no-sem.c no-signal.c no-timer.c
    99C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
    10 
    11 SRCS = $(C_FILES)
    12 OBJS = $(C_O_FILES)
    1310
    1411PGMS = $(C_FILES:%.c=$(ARCH)/%.rel)
     
    3027ASM4FLAGS += -I$(PROJECT_INCLUDE)/rtems
    3128
    32 all: ${ARCH} $(PGMS) $(TMPINSTALL_FILES)
     29all-local: ${ARCH} $(PGMS) $(TMPINSTALL_FILES)
     30
     31.PRECIOUS: $(PGMS)
    3332
    3433EXTRA_DIST = $(C_FILES)
  • c/src/optman/sapi/Makefile.am

    r8b91282 rdb3e0108  
    88C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
    99
    10 SRCS = $(C_FILES)
    11 OBJS = $(C_O_FILES)
    12 
    13 PGMNAME = $(C_FILES:%.c=%)
    1410PGMS = $(C_FILES:%.c=$(ARCH)/%.rel)
    1511
    1612include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    17 include $(RTEMS_ROOT)/make/leaf.cfg
     13include $(top_srcdir)/../../../automake/lib.am
    1814
    19 TMPINSTALL_FILES = \
    20 $(PROJECT_RELEASE)/lib \
    21 $(PGMNAME:%=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel)
     15TMPINSTALL_FILES += \
     16$(C_FILES:%.c=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel)
     17
     18$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
     19        $(INSTALL_DATA) $< $@
    2220
    2321#
     
    2826ASM4FLAGS += -I $(PROJECT_INCLUDE)/rtems
    2927
    30 $(PROJECT_RELEASE)/lib:
    31         $(mkinstalldirs) $@
    32 $(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
    33         $(INSTALL_DATA) $< $@
     28all-local: ${ARCH} $(PGMS) $(TMPINSTALL_FILES)
    3429
    35 all: ${ARCH} $(PGMS) $(TMPINSTALL_FILES)
     30.PRECIOUS: $(PGMS)
    3631
    3732EXTRA_DIST = $(C_FILES)
Note: See TracChangeset for help on using the changeset viewer.