Changeset 4e36a2f in rtems for c/src/lib/libbsp/i386/pc386


Ignore:
Timestamp:
01/31/00 15:27:02 (22 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
bb18b95
Parents:
8fbdf07
Message:

Patches rtems-rc-20000118-3.diff and rtems-rc-20000118-4.diff from
Ralf Corsepius <corsepiu@…> that contain:

  • Modifications, (minor) corrections, cleanups to most existing Makefile.ams
  • Adds automake support to all remaining BSPs which have not yet been converted to automake.
  • Makefile.am for all remaining wrapup/Makefile.ams
Location:
c/src/lib/libbsp/i386/pc386
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/i386/pc386/3c509/Makefile.am

    r8fbdf07 r4e36a2f  
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    7 PGM = ${ARCH}/3c509.rel
     7PGM = $(ARCH)/3c509.rel
    88
    9 ## C source names
    109C_FILES = 3c509.c elink.c
    11 X3c509_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o)
     10X3c509_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
    1211
    1312H_FILES = 3c509.h elink.h
    14 noinst_HEADERS = $(H_FILES)
    1513
    1614include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     
    2624        $(make-rel)
    2725
    28 if HAS_NETWORKING
    29 all-local: ${ARCH} $(PGM)
    30 endif
    3126
    3227# the .rel file built here will be put into libbsp.a by
    3328#       ../wrapup/Makefile
    3429
    35 EXTRA_DIST = 3c509.c elink.c
     30if HAS_NETWORKING
     31all-local: $(ARCH) $(X3c509_rel_OBJECTS) $(PGM)
     32endif
     33
     34.PRECIOUS: $(PGM)
     35
     36EXTRA_DIST = 3c509.c 3c509.h elink.c elink.h
    3637
    3738include $(top_srcdir)/../../../../../../automake/local.am
  • c/src/lib/libbsp/i386/pc386/clock/Makefile.am

    r8fbdf07 r4e36a2f  
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    7 PGM = ${ARCH}/clock.rel
     7PGM = $(ARCH)/clock.rel
    88
    9 ## C source names
    109C_FILES = ckinit.c rtc.c
    11 clock_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o)
     10clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
    1211
    1312include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     
    2120        $(make-rel)
    2221
    23 all-local: ${ARCH} $(PGM)
    24 
    2522# the .rel file built here will be put into libbsp.a by
    2623#       ../wrapup/Makefile
     24
     25all-local: $(ARCH) $(clock_rel_OBJECTS) $(PGM)
     26
     27.PRECIOUS: $(PGM)
    2728
    2829EXTRA_DIST = ckinit.c rtc.c
  • c/src/lib/libbsp/i386/pc386/console/Makefile.am

    r8fbdf07 r4e36a2f  
    77VPATH = @srcdir@:@srcdir@/../../shared/io
    88
    9 PGM = ${ARCH}/console.rel
     9PGM = $(ARCH)/console.rel
    1010
    11 ## sources
    1211C_FILES = console.c inch.c outch.c printk.c
    1312S_FILES = videoAsm.S
    1413
    15 console_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) $(S_FILES:%.S=${ARCH}/%.o)
     14console_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o)
    1615
    1716include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     
    2524        $(make-rel)
    2625
    27 all-local: ${ARCH} $(PGM)
    28 
    2926# the .rel file built here will be put into libbsp.a by
    3027#       ../wrapup/Makefile
     28
     29all-local: $(ARCH) $(console_rel_OBJECTS) $(PGM)
     30
     31.PRECIOUS: $(PGM)
    3132
    3233EXTRA_DIST = console.c inch.c outch.c videoAsm.S
  • c/src/lib/libbsp/i386/pc386/include/Makefile.am

    r8fbdf07 r4e36a2f  
    1212
    1313H_FILES = bsp.h crt.h $(WD80X3)
    14 noinst_HEADERS = $(H_FILES)
    1514
    1615$(PROJECT_INCLUDE):
     
    2322        $(INSTALL_DATA) $< $@
    2423
    25 PREINSTALL_FILES += $(PROJECT_INCLUDE) \
    26 $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \
    27 $(PROJECT_INCLUDE)/coverhd.h
     24PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \
     25    $(PROJECT_INCLUDE)/coverhd.h
    2826
    2927all-local: $(PREINSTALL_FILES)
    3028
     29EXTRA_DIST = bsp.h crt.h wd80x3.h
     30
    3131include $(top_srcdir)/../../../../../../automake/local.am
  • c/src/lib/libbsp/i386/pc386/ne2000/Makefile.am

    r8fbdf07 r4e36a2f  
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    7 PGM = ${ARCH}/ne2000.rel
     7PGM = $(ARCH)/ne2000.rel
    88
    9 ## C source names
    109C_FILES = ne2000.c
    11 ne2000_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o)
     10ne2000_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
    1211
    1312include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     
    2322        $(make-rel)
    2423
     24# the .rel file built here will be put into libbsp.a by
     25#       ../wrapup/Makefile
     26
    2527if HAS_NETWORKING
    26 all-local: ${ARCH} $(PGM)
     28all-local: $(ARCH) $(ne2000_rel_OBJECTS) $(PGM)
    2729endif
    2830
    29 # the .rel file built here will be put into libbsp.a by
    30 #       ../wrapup/Makefile
     31.PRECIOUS: $(PGM)
    3132
    3233EXTRA_DIST = ne2000.c
  • c/src/lib/libbsp/i386/pc386/start/Makefile.am

    r8fbdf07 r4e36a2f  
    1 #
    2 #  $Id$
    3 #
     1##
     2## $Id$
     3##
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    7 PGMS = ${ARCH}/start.o ${ARCH}/start16.bin
     7PGMS = $(ARCH)/start.o $(ARCH)/start16.bin
    88
    9 # Assembly source names, if any, go here -- minus the .S
    109S_FILES = start16.S start.S
    11 S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
     10S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
     11
     12OBJS = $(S_O_FILES)
    1213
    1314include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     
    2425LINKCMDS = $(top_srcdir)/startup/linkcmds
    2526
    26 ${ARCH}/start16.o: start16.S
    27         ${COMPILE.S} $(AM_CPPFLAGS) -DHEADERADDR=$(HEADERADDR) -o $@ $<
     27$(ARCH)/start16.o: start16.S
     28        $(COMPILE.S) $(AM_CPPFLAGS) -DHEADERADDR=$(HEADERADDR) -o $@ $<
    2829
    29 ${ARCH}/start16.bin: ${ARCH}/start16.o
    30         $(LD) -N -T $(LINKCMDS) -Ttext $(START16ADDR) -e start16 -nostdlib \
    31           --oformat=elf32-i386 -o $(basename $@).obj $(basename $@).o
     30$(ARCH)/start16.bin: $(ARCH)/start16.o
     31        $(LD) -N -T $(LINKCMDS) -Ttext $(START16ADDR) -e start16 -nostdlib        --oformat=elf32-i386 -o $(basename $@).obj $(basename $@).o
    3232        $(OBJCOPY) -O binary $(basename $@).obj $@
    3333
    34 $(PROJECT_RELEASE)/lib/start16$(LIB_VARIANT).bin: ${ARCH}/start16.bin
     34$(PROJECT_RELEASE)/lib/start16$(LIB_VARIANT).bin: $(ARCH)/start16.bin
    3535        $(INSTALL_DATA) $< $@
    3636
     
    3838        $(INSTALL_DATA) $< $@
    3939
    40 TMPINSTALL_FILES += \
    41 $(PROJECT_RELEASE)/lib/start16$(LIB_VARIANT).bin \
    42 $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o
     40TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start16$(LIB_VARIANT).bin \
     41    $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o
    4342
    44 all-local: $(ARCH) $(TMPINSTALL_FILES)
     43all-local: $(ARCH) $(OBJS) $(TMPINSTALL_FILES)
    4544
    4645EXTRA_DIST = start.S start16.S
  • c/src/lib/libbsp/i386/pc386/startup/Makefile.am

    r8fbdf07 r4e36a2f  
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    7 VPATH = \
    8     @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/irq:@srcdir@/../../shared/comm:@srcdir@/../../shared/pci
     7VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/irq:@srcdir@/../../shared/comm:@srcdir@/../../shared/pci
    98
    10 PGM = ${ARCH}/startup.rel
     9PGM = $(ARCH)/startup.rel
    1110
    12 ## C source names
    1311C_FILES = bsplibc.c bsppost.c bspstart.c exit.c irq.c irq_init.c bootcard.c \
    1412    main.c sbrk.c i386-stub.c i386-stub-glue.c uart.c pcibios.c \
    1513    gnatinstallhandler.c
    16 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
     14C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
    1715
    18 ## Assembly source names
    1916S_FILES = ldsegs.S irq_asm.S
    20 S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
     17S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
    2118
    2219startup_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES)
    2320
    2421include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    25 include $(RTEMS_ROOT)/make/leaf.cfg
     22include $(top_srcdir)/../../../../../../automake/lib.am
    2623
    2724#
     
    3330AM_CPPFLAGS += -DUSE_INIT_FINI
    3431
    35 $(PGM): ${startup_rel_OBJECTS}
     32$(PGM): $(startup_rel_OBJECTS)
    3633        $(make-rel)
    3734
     
    4138TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds
    4239
    43 all-local: ${ARCH} $(PREINSTALL_FILES) $(PGM) $(TMPINSTALL_FILES)
     40all-local: $(ARCH) $(startup_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES)
    4441
    45 EXTRA_DIST = bspstart.c exit.c sbrk.c ldsegs.S linkcmds
     42.PRECIOUS: $(PGM)
     43
     44EXTRA_DIST = bspstart.c exit.c ldsegs.S linkcmds sbrk.c
    4645
    4746include $(top_srcdir)/../../../../../../automake/local.am
  • c/src/lib/libbsp/i386/pc386/timer/Makefile.am

    r8fbdf07 r4e36a2f  
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    7 PGM = ${ARCH}/timer.rel
     7PGM = $(ARCH)/timer.rel
    88
    9 ## sources
    109C_FILES = timer.c
    1110S_FILES = timerisr.S
    12 timer_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) $(S_FILES:%.S=${ARCH}/%.o)
     11timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o)
    1312
    1413include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     
    2221        $(make-rel)
    2322
    24 all-local: ${ARCH} $(PGM)
    25 
    2623# the .rel file built here will be put into libbsp.a by
    2724#       ../wrapup/Makefile
     25
     26all-local: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
     27
     28.PRECIOUS: $(PGM)
    2829
    2930EXTRA_DIST = timer.c timerisr.S
  • c/src/lib/libbsp/i386/pc386/wd8003/Makefile.am

    r8fbdf07 r4e36a2f  
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    7 PGM = ${ARCH}/wd8003.rel
     7PGM = $(ARCH)/wd8003.rel
    88
    9 ## C source names
    109C_FILES = wd8003.c
    11 wd8003_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o)
     10wd8003_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
    1211
    1312include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     
    2322        $(make-rel)
    2423
     24# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
     25
    2526if HAS_NETWORKING
    26 all-local: ${ARCH} $(PGM)
     27all-local: $(ARCH) $(wd8003_rel_OBJECTS) $(PGM)
    2728endif
    2829
    29 # the .rel file built here will be put into libbsp.a by
    30 #       ../wrapup/Makefile
     30.PRECIOUS: $(PGM)
    3131
    3232EXTRA_DIST = wd8003.c
  • c/src/lib/libbsp/i386/pc386/wrapup/Makefile.am

    r8fbdf07 r4e36a2f  
    1212
    1313BSP_FILES = startup clock console timer $(NETWORK)
    14 GENERIC_FILES =
    1514
    1615# bummer; have to use $foreach since % pattern subst rules only replace 1x
    17 OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
    18     $(foreach piece, $(GENERIC_FILES), \
    19     ../../../$(piece)/$(ARCH)/$(piece).rel)
     16OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.o))
    2017LIB = $(ARCH)/libbsp.a
    2118
     
    2724#
    2825
    29 $(LIB): ${OBJS}
     26$(LIB): $(OBJS)
    3027        $(make-library)
    3128
     
    3532TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a
    3633
    37 all-local: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
     34all-local: $(ARCH) $(OBJS) $(LIB) $(TMPINSTALL_FILES)
     35
     36.PRECIOUS: $(LIB)
    3837
    3938include $(top_srcdir)/../../../../../../automake/local.am
Note: See TracChangeset for help on using the changeset viewer.