Changeset d7fb9f8 in rtems


Ignore:
Timestamp:
Feb 19, 2004, 6:11:55 AM (17 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
2a7f9a28
Parents:
5e5cf07
Message:

2004-02-19 Ralf Corsepius <corsepiu@…>

  • Makefile.am: Don't install *.rels. Reflect changes to bsp.am. Preinstall dist_project_lib*.
Location:
c/src/lib/libbsp/i386/pc386
Files:
2 edited

Legend:

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

    r5e5cf07 rd7fb9f8  
     12004-02-19      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * Makefile.am: Don't install *.rels. Reflect changes to bsp.am.
     4        Preinstall dist_project_lib*.
     5
    162004-02-14      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    27
  • c/src/lib/libbsp/i386/pc386/Makefile.am

    r5e5cf07 rd7fb9f8  
    1111include $(top_srcdir)/../../bsp.am
    1212
     13dist_project_lib_DATA = bsp_specs
     14
     15include_HEADERS = include/bsp.h
     16nodist_include_HEADERS = include/bspopts.h
     17
    1318EXTRA_PROGRAMS =
    1419CLEANFILES =
     
    2833EXTRA_DIST += start/start16.S
    2934start16.$(OBJEXT): start/start16.S
    30         $(COMPILE.S) $(AM_CPPFLAGS) -DHEADERADDR=$(HEADERADDR) -o $@ $<
     35        $(CPPASCOMPILE) $(AM_CPPFLAGS) -DHEADERADDR=$(HEADERADDR) -o $@ -c $<
    3136
    3237start16$(LIB_VARIANT)-elf32.$(OBJEXT): start16.$(OBJEXT)
     
    5560clock_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5661
    57 project_lib_DATA += clock$(LIB_VARIANT).rel
     62noinst_DATA += clock$(LIB_VARIANT).rel
    5863
    5964include_rtemsdir = $(includedir)/rtems
     
    7782console_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    7883
    79 project_lib_DATA += console$(LIB_VARIANT).rel
     84noinst_DATA += console$(LIB_VARIANT).rel
    8085
    8186EXTRA_PROGRAMS += gdb.rel
     
    9398gdb_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    9499
    95 project_lib_DATA += gdb$(LIB_VARIANT).rel
     100noinst_DATA += gdb$(LIB_VARIANT).rel
    96101
    97102EXTRA_PROGRAMS += gnat.rel
     
    107112gnat_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    108113
    109 project_lib_DATA += gnat$(LIB_VARIANT).rel
     114noinst_DATA += gnat$(LIB_VARIANT).rel
    110115
    111116EXTRA_PROGRAMS += pci.rel
     
    121126pci_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    122127
    123 project_lib_DATA += pci$(LIB_VARIANT).rel
     128noinst_DATA += pci$(LIB_VARIANT).rel
    124129
    125130EXTRA_PROGRAMS += startup.rel
     
    139144startup_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    140145
    141 project_lib_DATA += startup$(LIB_VARIANT).rel
     146noinst_DATA += startup$(LIB_VARIANT).rel
    142147
    143148EXTRA_PROGRAMS += timer.rel
     
    153158timer_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    154159
    155 project_lib_DATA += timer$(LIB_VARIANT).rel
     160noinst_DATA += timer$(LIB_VARIANT).rel
    156161
    157162if HAS_NETWORKING
     
    224229ide_g_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    225230
    226 project_lib_DATA += ide$(LIB_VARIANT).rel
     231noinst_DATA += ide$(LIB_VARIANT).rel
    227232
    228233EXTRA_LIBRARIES = libbsp.a
     
    254259
    255260PREINSTALL_DIRS =
     261PREINSTALL_FILES =
    256262TMPINSTALL_FILES =
     263
     264$(PROJECT_INCLUDE)/$(dirstamp):
     265        @$(mkdir_p) $(PROJECT_INCLUDE)
     266        @: > $(PROJECT_INCLUDE)/$(dirstamp)
     267PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
     268
     269$(PROJECT_LIB)/$(dirstamp):
     270        @$(mkdir_p) $(PROJECT_LIB)
     271        @: > $(PROJECT_LIB)/$(dirstamp)
     272PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
     273
     274$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
     275        $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
     276PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
     277
     278$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
     279        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
     280PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
     281
     282$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
     283        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
     284PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
    257285
    258286$(PROJECT_INCLUDE)/crt.h: include/crt.h $(PROJECT_INCLUDE)/$(dirstamp)
     
    274302$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
    275303        $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
    276 TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
    277 
    278 $(PROJECT_LIB)/clock$(LIB_VARIANT).rel: clock$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
    279         $(INSTALL_DATA) $< $(PROJECT_LIB)/clock$(LIB_VARIANT).rel
    280 TMPINSTALL_FILES += $(PROJECT_LIB)/clock$(LIB_VARIANT).rel
     304PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
    281305
    282306$(PROJECT_INCLUDE)/rtems/$(dirstamp):
     
    305329PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/fb_vga.h
    306330
    307 $(PROJECT_LIB)/console$(LIB_VARIANT).rel: console$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
    308         $(INSTALL_DATA) $< $(PROJECT_LIB)/console$(LIB_VARIANT).rel
    309 TMPINSTALL_FILES += $(PROJECT_LIB)/console$(LIB_VARIANT).rel
    310 
    311 $(PROJECT_LIB)/gdb$(LIB_VARIANT).rel: gdb$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
    312         $(INSTALL_DATA) $< $(PROJECT_LIB)/gdb$(LIB_VARIANT).rel
    313 TMPINSTALL_FILES += $(PROJECT_LIB)/gdb$(LIB_VARIANT).rel
    314 
    315 $(PROJECT_LIB)/gnat$(LIB_VARIANT).rel: gnat$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
    316         $(INSTALL_DATA) $< $(PROJECT_LIB)/gnat$(LIB_VARIANT).rel
    317 TMPINSTALL_FILES += $(PROJECT_LIB)/gnat$(LIB_VARIANT).rel
    318 
    319 $(PROJECT_LIB)/pci$(LIB_VARIANT).rel: pci$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
    320         $(INSTALL_DATA) $< $(PROJECT_LIB)/pci$(LIB_VARIANT).rel
    321 TMPINSTALL_FILES += $(PROJECT_LIB)/pci$(LIB_VARIANT).rel
    322 
    323 $(PROJECT_LIB)/startup$(LIB_VARIANT).rel: startup$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
    324         $(INSTALL_DATA) $< $(PROJECT_LIB)/startup$(LIB_VARIANT).rel
    325 TMPINSTALL_FILES += $(PROJECT_LIB)/startup$(LIB_VARIANT).rel
    326 
    327 $(PROJECT_LIB)/timer$(LIB_VARIANT).rel: timer$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
    328         $(INSTALL_DATA) $< $(PROJECT_LIB)/timer$(LIB_VARIANT).rel
    329 TMPINSTALL_FILES += $(PROJECT_LIB)/timer$(LIB_VARIANT).rel
    330 
    331331if HAS_NETWORKING
    332332$(PROJECT_INCLUDE)/wd80x3.h: include/wd80x3.h $(PROJECT_INCLUDE)/$(dirstamp)
     
    335335endif
    336336
    337 $(PROJECT_LIB)/ide$(LIB_VARIANT).rel: ide$(LIB_VARIANT).rel $(PROJECT_LIB)/$(dirstamp)
    338         $(INSTALL_DATA) $< $(PROJECT_LIB)/ide$(LIB_VARIANT).rel
    339 TMPINSTALL_FILES += $(PROJECT_LIB)/ide$(LIB_VARIANT).rel
    340 
    341337CLEANFILES += $(PREINSTALL_FILES)
    342 DISTCLEANFILES += $(PREINSTALL_DIRS)
     338DISTCLEANFILES = $(PREINSTALL_DIRS)
    343339CLEANFILES += $(TMPINSTALL_FILES)
    344340
Note: See TracChangeset for help on using the changeset viewer.