diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-01-26 16:26:01 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-01-26 16:26:43 +0100 |
| commit | 93244a97699dce70e83fb009ba86c8659b41adb9 (patch) | |
| tree | cbbe4249b7b7cf5034e94934885c9671d15d78fc | |
| parent | Revert "drvmgr: Move bsp_driver_level_hook() calls" (diff) | |
| download | rtems-93244a97699dce70e83fb009ba86c8659b41adb9.tar.bz2 | |
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.
| -rw-r--r-- | cpukit/Makefile.am | 2 | ||||
| -rw-r--r-- | cpukit/preinstall.am | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 1758fff704..86c20a9d2d 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 95d61ae781..0758ec5263 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 |