[rtems commit] drvmgr: Install header files conditionally
Sebastian Huber
sebh at rtems.org
Tue Jan 26 15:27:56 UTC 2016
Module: rtems
Branch: master
Commit: 93244a97699dce70e83fb009ba86c8659b41adb9
Changeset: http://git.rtems.org/rtems/commit/?id=93244a97699dce70e83fb009ba86c8659b41adb9
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Tue Jan 26 16:26:01 2016 +0100
drvmgr: Install header files conditionally
The --enable-drvmgr configure option controls the driver manager startup
and not if the driver manager is present or not. Presence of the driver
manager is determined by the architecture (only available on sparc so
far).
Partially revert 47190194866ba83cbfeeb5816bb18ddd9f6e8e50.
---
cpukit/Makefile.am | 2 ++
cpukit/preinstall.am | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index 1758fff..86c20a9 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -242,10 +242,12 @@ include_rtems_HEADERS += libmisc/untar/untar.h
include_rtems_HEADERS += libmisc/fsmount/fsmount.h
## Driver manager
+if LIBDRVMGR
include_drvmgrdir = $(includedir)/drvmgr
include_drvmgr_HEADERS = libdrvmgr/drvmgr.h
include_drvmgr_HEADERS += libdrvmgr/drvmgr_confdefs.h
include_drvmgr_HEADERS += libdrvmgr/drvmgr_list.h
+endif
## HACK: doxygen filter.
EXTRA_DIST = doxy-filter
diff --git a/cpukit/preinstall.am b/cpukit/preinstall.am
index 95d61ae..0758ec5 100644
--- a/cpukit/preinstall.am
+++ b/cpukit/preinstall.am
@@ -527,6 +527,7 @@ $(PROJECT_INCLUDE)/rtems/fsmount.h: libmisc/fsmount/fsmount.h $(PROJECT_INCLUDE)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/fsmount.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/fsmount.h
+if LIBDRVMGR
$(PROJECT_INCLUDE)/drvmgr/$(dirstamp):
@$(MKDIR_P) $(PROJECT_INCLUDE)/drvmgr
@: > $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
@@ -543,4 +544,4 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/drvmgr_confdefs.h
$(PROJECT_INCLUDE)/drvmgr/drvmgr_list.h: libdrvmgr/drvmgr_list.h $(PROJECT_INCLUDE)/drvmgr/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/drvmgr/drvmgr_list.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/drvmgr/drvmgr_list.h
-
+endif
More information about the vc
mailing list