RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2004-03-29 Ralf Corsepius <ralf_corsepius@rtems.org>

Browse Source 
PR 561/rtems
	* include/rtems/concat.h: New.
	* Makefile.am: Add include/rtems/concat.h.

	PR/589 rtems
	* Makefile.am: Add include/rtems/pci.h.

	* Makefile.am: Include automake/compile.am.
	* configure.ac: RTEMS_TOP([..],[]).
This commit is contained in:
Ralf Corsepius
2004-03-29 12:43:20 +00:00
parent 894b7f9712
commit 2f4c86f83e
4 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cpukit/ChangeLog
View File

@@ -1,3 +1,15 @@
2004-03-29 Ralf Corsepius <ralf_corsepius@rtems.org>
PR 561/rtems
* include/rtems/concat.h: New.
* Makefile.am: Add include/rtems/concat.h.
PR/589 rtems
* Makefile.am: Add include/rtems/pci.h.
* Makefile.am: Include automake/compile.am.
* configure.ac: RTEMS_TOP([..],[]).
2004-03-29 Ralf Corsepius <ralf_corsepius@rtems.org> 2004-03-29 Ralf Corsepius <ralf_corsepius@rtems.org>
* aclocal/rtems-top.m4: Add MULTISUBDIR. Add MULTIBUILDTOP. * aclocal/rtems-top.m4: Add MULTISUBDIR. Add MULTIBUILDTOP.

12
cpukit/Makefile.am
View File

@@ -4,6 +4,7 @@
ACLOCAL_AMFLAGS = -I aclocal ACLOCAL_AMFLAGS = -I aclocal
include $(top_srcdir)/automake/compile.am
include $(top_srcdir)/automake/multilib.am include $(top_srcdir)/automake/multilib.am
SUBDIRS = . ada score rtems sapi posix itron SUBDIRS = . ada score rtems sapi posix itron
@@ -21,7 +22,8 @@ CLEANFILES = preinstall-stamp
include_rtemsdir = $(includedir)/rtems include_rtemsdir = $(includedir)/rtems
include_rtems_HEADERS = include/rtems/bspIo.h include/rtems/userenv.h \ include_rtems_HEADERS = include/rtems/bspIo.h include/rtems/userenv.h \
include/rtems/fs.h include/rtems/stdint.h include/rtems/fs.h include/rtems/pci.h include/rtems/stdint.h \
include/rtems/concat.h
PREINSTALL_DIRS = PREINSTALL_DIRS =
PREINSTALL_FILES = PREINSTALL_FILES =
@@ -43,10 +45,18 @@ $(PROJECT_INCLUDE)/rtems/fs.h: include/rtems/fs.h $(PROJECT_INCLUDE)/rtems/$(dir
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/fs.h $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/fs.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/fs.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/fs.h
$(PROJECT_INCLUDE)/rtems/pci.h: include/rtems/pci.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/pci.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/pci.h
$(PROJECT_INCLUDE)/rtems/stdint.h: include/rtems/stdint.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) $(PROJECT_INCLUDE)/rtems/stdint.h: include/rtems/stdint.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/stdint.h $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/stdint.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/stdint.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/stdint.h
$(PROJECT_INCLUDE)/rtems/concat.h: include/rtems/concat.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/concat.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/concat.h
CLEANFILES += $(PREINSTALL_FILES) CLEANFILES += $(PREINSTALL_FILES)
DISTCLEANFILES = $(PREINSTALL_DIRS) DISTCLEANFILES = $(PREINSTALL_DIRS)

2
cpukit/configure.ac
View File

@@ -5,7 +5,7 @@
AC_PREREQ(2.59) AC_PREREQ(2.59)
AC_INIT([rtems-cpukit],[_RTEMS_VERSION],[rtems-bugs@rtems.com]) AC_INIT([rtems-cpukit],[_RTEMS_VERSION],[rtems-bugs@rtems.com])
AC_CONFIG_SRCDIR([score]) AC_CONFIG_SRCDIR([score])
RTEMS_TOP([.]) RTEMS_TOP([..],[])
RTEMS_CANONICAL_TARGET_CPU RTEMS_CANONICAL_TARGET_CPU

19
cpukit/include/rtems/concat.h Normal file
View File

@@ -0,0 +1,19 @@
/*
* The license and distribution terms for this file may be
* found in found in the file LICENSE in this distribution or at
* http://www.rtems.com/license/LICENSE.
*
* $Id$
*/
#ifndef _rtems_concat_h
#define _rtems_concat_h
/* ANSI concatenation macros. */
#define CONCAT1(a, b) CONCAT2(a, b)
#define CONCAT2(a, b) a ## b
#define EXPAND0(x) x
#endif