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

2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* include/rtems++/Makefile.am: Remove.
	* include/Makefile.am: Handle subdirs, require automake-1.5.
	* configure.ac: Reflect changes above.
	* Makefile.am: Require automake-1.5.
This commit is contained in:
Joel Sherrill
2001-10-16 18:51:47 +00:00
parent 49ed8e7758
commit 8917506d1c
5 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
c/src/librtems++/ChangeLog
View File

@@ -1,3 +1,10 @@
2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/rtems++/Makefile.am: Remove.
* include/Makefile.am: Handle subdirs, require automake-1.5.
* configure.ac: Reflect changes above.
* Makefile.am: Require automake-1.5.
2001-10-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2001-10-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* .cvsignore: Add autom4te.cache for autoconf > 2.52. * .cvsignore: Add autom4te.cache for autoconf > 2.52.

2
c/src/librtems++/Makefile.am
View File

@@ -2,7 +2,7 @@
## $Id$ ## $Id$
## ##
AUTOMAKE_OPTIONS = foreign 1.4 AUTOMAKE_OPTIONS = foreign 1.5
ACLOCAL_AMFLAGS = -I ../../../aclocal ACLOCAL_AMFLAGS = -I ../../../aclocal
SUBDIRS = include src SUBDIRS = include src

1
c/src/librtems++/configure.ac
View File

@@ -34,7 +34,6 @@ RTEMS_PROJECT_ROOT
# Explicitly list all Makefiles here # Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
include/Makefile include/Makefile
include/rtems++/Makefile
src/Makefile src/Makefile
]) ])
AC_OUTPUT AC_OUTPUT

24
c/src/librtems++/include/Makefile.am
View File

@@ -2,9 +2,27 @@
## $Id$ ## $Id$
## ##
AUTOMAKE_OPTIONS = foreign 1.4 AUTOMAKE_OPTIONS = foreign 1.5
SUBDIRS = rtems++ include_rtems__dir = $(includedir)/rtems++
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/rtems++:
@$(mkinstalldirs) $@
if HAS_CXX
include_rtems___HEADERS = rtems++/rtemsEvent.h \
rtems++/rtemsInterrupt.h rtems++/rtemsMessageQueue.h rtems++/rtemsSemaphore.h \
rtems++/rtemsStatusCode.h rtems++/rtemsTask.h rtems++/rtemsTaskMode.h \
rtems++/rtemsTimer.h
PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems++ \
$(include_rtems___HEADERS:%=$(PROJECT_INCLUDE)/%)
endif
all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am include $(top_srcdir)/../../../automake/local.am

23
c/src/librtems++/include/rtems++/Makefile.am
View File

@@ -1,23 +0,0 @@
##
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
if HAS_CXX
include_rtems__dir = $(includedir)/rtems++
include_rtems___HEADERS = rtemsEvent.h rtemsInterrupt.h rtemsMessageQueue.h rtemsSemaphore.h \
rtemsStatusCode.h rtemsTask.h rtemsTaskMode.h rtemsTimer.h
PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems++ \
$(include_rtems___HEADERS:%=$(PROJECT_INCLUDE)/rtems++/%)
$(PROJECT_INCLUDE)/rtems++:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems++/%.h: %.h
$(INSTALL_DATA) $< $@
endif
all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/../../../automake/local.am