Changeset ba962ea in rtems


Ignore:
Timestamp:
12/12/03 10:37:19 (20 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
ab25c258
Parents:
88f4967f
Message:

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

  • aclocal/lead-dot.m4: Remove (Use the version in automake-1.8).
  • automake/lib.am: Remove $(project_libdir)$(MULTISUBDIR).
  • aclocal/env-rtemscpu.m4: Reflect new definition of project_lib.
  • Makefile.am: Remove BUILT_SOURCES.
Location:
cpukit
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • cpukit/ChangeLog

    r88f4967f rba962ea  
     12003-12-12      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * aclocal/lead-dot.m4: Remove (Use the version in automake-1.8).
     4        * automake/lib.am: Remove $(project_libdir)$(MULTISUBDIR).
     5        * aclocal/env-rtemscpu.m4: Reflect new definition of project_lib.
     6        * Makefile.am: Remove BUILT_SOURCES.
     7
    182003-12-12      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    29

  • cpukit/Makefile.am

    r88f4967f rba962ea  
    2323include_rtems_HEADERS = include/rtems/bspIo.h include/rtems/userenv.h \
    2424    include/rtems/fs.h include/rtems/stdint.h
    25 
    26 BUILT_SOURCES = $(PREINSTALL_FILES)
    2725
    2826AUTOMAKE_FILES = automake/compile.am automake/lib.am automake/local.am \

  • cpukit/aclocal/env-rtemscpu.m4

    r88f4967f rba962ea  
    1515    AC_SUBST(MULTISUBDIR)
    1616 
    17     project_includedir="\$(PROJECT_ROOT)/include"
    18     project_libdir="\$(PROJECT_ROOT)/lib\$(MULTISUBDIR)"
    19  
     17    AC_SUBST([PROJECT_INCLUDE],["\$(PROJECT_ROOT)/lib/include"])
     18    AC_SUBST([PROJECT_RELEASE],["\$(PROJECT_ROOT)"])
     19
    2020    includedir="\${exec_prefix}/include"
    2121    libdir="${libdir}\$(MULTISUBDIR)"
    … …  
    4040    AC_SUBST(RTEMS_BSP)
    4141 
    42     project_includedir="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
    43     project_libdir="${PROJECT_ROOT}/$RTEMS_BSP/lib"   
    44 
    4542    includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include"
    4643    libdir="\${exec_prefix}/${RTEMS_BSP}/lib"
     44
     45    AC_SUBST([PROJECT_INCLUDE],["\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"])
     46    AC_SUBST([PROJECT_RELEASE],["\$(PROJECT_ROOT)/$RTEMS_BSP"])
    4747
    4848    RTEMS_ENABLE_BARE
    … …  
    5151  ])
    5252
    53   AC_SUBST(project_libdir)
    54   AC_SUBST(project_includedir)
     53  AC_SUBST([project_libdir],["\$(libdir)"])
     54  AC_SUBST([project_includedir],["\$(includedir)"])
    5555
    56   # FIXME: Deprecated, to be removed
    57   AC_SUBST(PROJECT_INCLUDE,[$project_includedir])
    58  
    5956  AM_CONDITIONAL([MULTILIB],[test x"$multilib" = x"yes"])
    6057])

  • cpukit/automake/lib.am

    r88f4967f rba962ea  
    1414endef
    1515
    16 $(project_libdir)$(MULTISUBDIR):
    17         @$(mkinstalldirs) $@
    18 
    19 TMPINSTALL_FILES = $(project_libdir)$(MULTISUBDIR)
    20 
    21 .PRECIOUS: $(LIB)
     16TMPINSTALL_FILES =
Note: See TracChangeset for help on using the changeset viewer.