diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-03-29 12:43:20 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-03-29 12:43:20 +0000 |
| commit | 2f4c86f83ee2c0c7cad9e1a14dd373a8bfb192fb (patch) | |
| tree | 7a04f191f6d6ea54e30bd850957a6dd1f3b79b36 /cpukit | |
| parent | 2004-03-29 Ralf Corsepius <ralf_corsepius@rtems.org> (diff) | |
| download | rtems-2f4c86f83ee2c0c7cad9e1a14dd373a8bfb192fb.tar.bz2 | |
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([..],[]).
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 12 | ||||
| -rw-r--r-- | cpukit/Makefile.am | 12 | ||||
| -rw-r--r-- | cpukit/configure.ac | 2 | ||||
| -rw-r--r-- | cpukit/include/rtems/concat.h | 19 |
4 files changed, 43 insertions, 2 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 1d3d3bc2d1..62182a7ebb 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,17 @@ 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> + * aclocal/rtems-top.m4: Add MULTISUBDIR. Add MULTIBUILDTOP. Add rtems_updir. Remove version.m4 check. Add PROJECT_ROOT/with_project_root processing. diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 9d8527ddfb..53b276b2df 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -4,6 +4,7 @@ ACLOCAL_AMFLAGS = -I aclocal +include $(top_srcdir)/automake/compile.am include $(top_srcdir)/automake/multilib.am SUBDIRS = . ada score rtems sapi posix itron @@ -21,7 +22,8 @@ CLEANFILES = preinstall-stamp include_rtemsdir = $(includedir)/rtems 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_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 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) $(INSTALL_DATA) $< $(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) DISTCLEANFILES = $(PREINSTALL_DIRS) diff --git a/cpukit/configure.ac b/cpukit/configure.ac index a9e0db9040..67a24ad5fe 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -5,7 +5,7 @@ AC_PREREQ(2.59) AC_INIT([rtems-cpukit],[_RTEMS_VERSION],[rtems-bugs@rtems.com]) AC_CONFIG_SRCDIR([score]) -RTEMS_TOP([.]) +RTEMS_TOP([..],[]) RTEMS_CANONICAL_TARGET_CPU diff --git a/cpukit/include/rtems/concat.h b/cpukit/include/rtems/concat.h new file mode 100644 index 0000000000..df4a7a7b19 --- /dev/null +++ b/cpukit/include/rtems/concat.h @@ -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 |