summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2015-04-17 09:18:05 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2015-04-17 09:19:03 +0200
commitc7a65085d2646699762ed3cc2412d58fc50b9165 (patch)
treed0c54861b17e78869323339d95da62322ff77e46
parentsapi: Avoid declaration in source, fix type (diff)
downloadrtems-c7a65085d2646699762ed3cc2412d58fc50b9165.tar.bz2
Fix build for non-SPARC targets
-rw-r--r--cpukit/libmisc/Makefile.am11
-rw-r--r--cpukit/wrapup/Makefile.am6
2 files changed, 15 insertions, 2 deletions
diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am
index 436986a1c5..9cd52ea5ef 100644
--- a/cpukit/libmisc/Makefile.am
+++ b/cpukit/libmisc/Makefile.am
@@ -110,13 +110,20 @@ libshell_a_SOURCES = shell/cat_file.c shell/cmds.c shell/internal.h \
shell/main_mkrfs.c shell/main_debugrfs.c shell/main_df.c \
shell/main_lsof.c shell/main_edit.c \
shell/main_blkstats.c shell/main_rtrace.c \
- shell/shell-wait-for-input.c \
- shell/main_drvmgr.c shell/main_pci.c
+ shell/shell-wait-for-input.c
libshell_a_SOURCES += shell/main_cmdls.c
libshell_a_SOURCES += shell/main_cmdchown.c
libshell_a_SOURCES += shell/main_cmdchmod.c
libshell_a_SOURCES += shell/main_profreport.c
+if LIBDRVMGR
+libshell_a_SOURCES += shell/main_drvmgr.c
+endif
+
+if LIBPCI
+libshell_a_SOURCES += shell/main_pci.c
+endif
+
if LIBNETWORKING
libshell_a_SOURCES += \
shell/main_ifconfig.c shell/main_route.c shell/main_netstats.c \
diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am
index 8ac5a728d0..6fafad5bc1 100644
--- a/cpukit/wrapup/Makefile.am
+++ b/cpukit/wrapup/Makefile.am
@@ -64,8 +64,14 @@ endif
TMP_LIBS += ../libmisc/libuuid.a
TMP_LIBS += ../libi2c/libi2c.a
+
+if LIBPCI
TMP_LIBS += ../libpci/libpci.a
+endif
+
+if LIBDRVMGR
TMP_LIBS += ../libdrvmgr/libdrvmgr.a
+endif
if LIBNETWORKING
TMP_LIBS += ../libnetworking/libnetworking.a