Changeset 57d673c in rtems


Ignore:
Timestamp:
Dec 3, 2003, 3:27:06 PM (17 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
184f279
Parents:
900301fe
Message:

2003-12-03 Ralf Corsepius <corsepiu@…>

  • Makefile.am: Merge-in shared/Makefile.am, shmdr/Makefile.am.
  • shared/Makefile.am: Remove.
  • shmdir/Makefile.am: Remove.
  • bsp.am: Add preinstallation dirstamp support.
Location:
c/src/lib/libbsp
Files:
2 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/ChangeLog

    r900301fe r57d673c  
     12003-12-03      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * Makefile.am: Merge-in shared/Makefile.am, shmdr/Makefile.am.
     4        * shared/Makefile.am: Remove.
     5        * shmdir/Makefile.am: Remove.
     6        * bsp.am: Add preinstallation dirstamp support.
     7
    182003-12-02      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    29
  • c/src/lib/libbsp/Makefile.am

    r900301fe r57d673c  
    22## $Id$
    33##
     4
     5include $(top_srcdir)/automake/compile.am
     6include $(top_srcdir)/automake/lib.am
    47
    58# If we are building a "real" BSP, then we need to descend into the
     
    912# into that directory.
    1013
    11 SUBDIRS = shared shmdr @libbsp_cpu_subdir@
    12 DIST_SUBDIRS = shared shmdr @libbsp_cpu_subdir@
     14SUBDIRS = @libbsp_cpu_subdir@
     15DIST_SUBDIRS = @libbsp_cpu_subdir@
    1316
    1417EXTRA_DIST = MERGE.PROCEDURE bsp.am
    1518
     19# shared
     20EXTRA_DIST += shared/bootcard.c shared/bspclean.c shared/bsplibc.c \
     21    shared/bsppost.c shared/console-polled.c shared/console.c \
     22    shared/gnatinstallhandler.c shared/main.c shared/sbrk.c shared/tod.c \
     23    shared/tod.h
     24EXTRA_DIST += shared/vmeUniverse/vmeUniverse.c \
     25    shared/vmeUniverse/vmeUniverse.h
     26EXTRA_DIST += shared/include/coverhd.h
     27EXTRA_DIST += shared/gdbstub/rtems-stub-glue.c
     28
     29# shmdr
     30shmdr_C_FILES = shmdr/addlq.c shmdr/cnvpkt.c shmdr/getlq.c shmdr/dump.c \
     31    shmdr/fatal.c shmdr/getpkt.c shmdr/init.c shmdr/initlq.c shmdr/intr.c \
     32    shmdr/mpisr.c shmdr/poll.c shmdr/receive.c shmdr/retpkt.c shmdr/send.c \
     33    shmdr/setckvec.c
     34shmdr_OBJS = $(shmdr_C_FILES:shmdr/%.c=shmdr/$(ARCH)/%.$(OBJEXT))
     35
     36# the .rel file built here will be put into libbsp.a by
     37#   ../$(RTEMS_BSP_FAMILY)/wrapup/Makefile
     38
     39shmdr/$(ARCH)/$(dirstamp):
     40        @$(mkinstalldirs) shmdr/$(ARCH)
     41        @: > shmdr/$(ARCH)/$(dirstamp)
     42shmdr/$(ARCH)/%.$(OBJEXT): shmdr/%.c shmdr/$(ARCH)/$(dirstamp)
     43        ${COMPILE} -o $@ -c $<
     44shmdr/$(ARCH)/shmdr.rel: $(shmdr_OBJS)
     45        $(make-rel)
     46
     47$(PROJECT_RELEASE)/lib/shmdr$(LIB_VARIANT).rel: shmdr/$(ARCH)/shmdr.rel
     48        $(INSTALL_DATA) $< $@
     49
     50if HAS_MP
     51include_HEADERS = shmdir/shm_driver.h shmdir/mpci.h
     52
     53TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/shmdr$(LIB_VARIANT).rel
     54
     55all-local: $(PREINSTALL_FILES) shmdr/$(ARCH)/shmdr.rel $(TMPINSTALL_FILES)
     56endif
     57
     58.PRECIOUS: shmdr/$(ARCH)/shmdr.rel
     59
     60EXTRA_DIST += shmdr/README shmdr/addlq.c shmdr/cnvpkt.c shmdr/dump.c \
     61    shmdr/fatal.c shmdr/getlq.c shmdr/getpkt.c shmdr/init.c shmdr/initlq.c \
     62    shmdr/intr.c shmdr/mpisr.c shmdr/poll.c shmdr/receive.c shmdr/retpkt.c \
     63    shmdr/send.c shmdr/setckvec.c
     64
     65PREINSTALL_FILES =
     66
     67$(PROJECT_INCLUDE)/$(dirstamp):
     68        @$(mkinstalldirs) $(PROJECT_INCLUDE)
     69        @: > $(PROJECT_INCLUDE)/$(dirstamp)
     70PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
     71
     72if HAS_MP
     73$(PROJECT_INCLUDE)/shm_driver.h: shmdir/shm_driver.h $(PROJECT_INCLUDE)/$(dirstamp)
     74        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/shm_driver.h
     75PREINSTALL_FILES += $(PROJECT_INCLUDE)/shm_driver.h
     76
     77$(PROJECT_INCLUDE)/mpci.h: shmdir/mpci.h $(PROJECT_INCLUDE)/$(dirstamp)
     78        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpci.h
     79PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpci.h
     80endif
     81
    1682include $(top_srcdir)/automake/subdirs.am
    1783include $(top_srcdir)/automake/local.am
  • c/src/lib/libbsp/bsp.am

    r900301fe r57d673c  
    88nodist_include_HEADERS = include/bspopts.h
    99
    10 $(PROJECT_ROOT)/@RTEMS_BSP@/lib:
    11         @$(mkinstalldirs) $@
    12 PREINSTALL_FILES = $(PROJECT_ROOT)/@RTEMS_BSP@/lib
     10$(PROJECT_ROOT)/@RTEMS_BSP@/lib/$(dirstamp):
     11        @$(mkinstalldirs) $(PROJECT_ROOT)/@RTEMS_BSP@/lib
     12        @: > $(PROJECT_ROOT)/@RTEMS_BSP@/lib/$(dirstamp)
     13PREINSTALL_FILES = $(PROJECT_ROOT)/@RTEMS_BSP@/lib/$(dirstamp)
    1314
    14 $(PROJECT_INCLUDE):
    15         @$(mkinstalldirs) $@
    16 PREINSTALL_FILES += $(PROJECT_INCLUDE)
     15$(PROJECT_INCLUDE)/$(dirstamp):
     16        @$(mkinstalldirs) $(PROJECT_INCLUDE)
     17        @: > $(PROJECT_INCLUDE)/$(dirstamp)
     18PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
    1719
    18 $(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: bsp_specs
     20$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: bsp_specs $(PROJECT_ROOT)/@RTEMS_BSP@/lib/$(dirstamp)
    1921        $(INSTALL_DATA) $< $@
    2022PREINSTALL_FILES += $(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs
    2123
    22 $(PROJECT_INCLUDE)/bsp.h: include/bsp.h
     24$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
    2325        $(INSTALL_DATA) $< $@
    2426PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
    2527
    26 $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h
     28$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
    2729        $(INSTALL_DATA) $< $@
    2830PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
Note: See TracChangeset for help on using the changeset viewer.