[PATCH 28/31] build: Merge libmisc/Makefile.am

Sebastian Huber sebastian.huber at embedded-brains.de
Mon Oct 8 10:43:30 UTC 2018 

---
 cpukit/Makefile.am         | 215 ++++++++++++++++++++++++++++++++++++++++++++-
 cpukit/configure.ac        |   1 -
 cpukit/libmisc/Makefile.am | 199 -----------------------------------------
 cpukit/wrapup/Makefile.am  |  35 --------
 4 files changed, 214 insertions(+), 236 deletions(-)
 delete mode 100644 cpukit/libmisc/Makefile.am

diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index fadecf30f5..49a90b84d6 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -260,6 +260,84 @@ libcpukit_a_SOURCES += libcsupport/src/vprintk.c
 libcpukit_a_SOURCES += libcsupport/src/write.c
 libcpukit_a_SOURCES += libcsupport/src/write_r.c
 libcpukit_a_SOURCES += libcsupport/src/writev.c
+libcpukit_a_SOURCES += libmisc/bspcmdline/bspcmdline_get.c
+libcpukit_a_SOURCES += libmisc/bspcmdline/bspcmdline_getparam.c
+libcpukit_a_SOURCES += libmisc/bspcmdline/bspcmdline_getparamraw.c
+libcpukit_a_SOURCES += libmisc/bspcmdline/bspcmdline_getparamrhs.c
+libcpukit_a_SOURCES += libmisc/capture/capture_buffer.c
+libcpukit_a_SOURCES += libmisc/capture/capture.c
+libcpukit_a_SOURCES += libmisc/capture/capture-cli.c
+libcpukit_a_SOURCES += libmisc/capture/capture_support.c
+libcpukit_a_SOURCES += libmisc/capture/capture_user_extension.c
+libcpukit_a_SOURCES += libmisc/capture/rtems-trace-buffer-vars.c
+libcpukit_a_SOURCES += libmisc/cpuuse/cpuinforeport.c
+libcpukit_a_SOURCES += libmisc/cpuuse/cpuusagedata.c
+libcpukit_a_SOURCES += libmisc/cpuuse/cpuusagereport.c
+libcpukit_a_SOURCES += libmisc/cpuuse/cpuusagereset.c
+libcpukit_a_SOURCES += libmisc/cpuuse/cpuusagetop.c
+libcpukit_a_SOURCES += libmisc/devnull/devnull.c
+libcpukit_a_SOURCES += libmisc/devnull/devzero.c
+libcpukit_a_SOURCES += libmisc/dummy/default-configuration.c
+libcpukit_a_SOURCES += libmisc/dummy/dummy-networking.c
+libcpukit_a_SOURCES += libmisc/dumpbuf/dumpbuf.c
+libcpukit_a_SOURCES += libmisc/fb/mw_print.c
+libcpukit_a_SOURCES += libmisc/fb/mw_uid.c
+libcpukit_a_SOURCES += libmisc/fsmount/fsmount.c
+libcpukit_a_SOURCES += libmisc/monitor/mon-command.c
+libcpukit_a_SOURCES += libmisc/monitor/mon-config.c
+libcpukit_a_SOURCES += libmisc/monitor/mon-driver.c
+libcpukit_a_SOURCES += libmisc/monitor/mon-editor.c
+libcpukit_a_SOURCES += libmisc/monitor/mon-extension.c
+libcpukit_a_SOURCES += libmisc/monitor/mon-itask.c
+libcpukit_a_SOURCES += libmisc/monitor/mon-manager.c
+libcpukit_a_SOURCES += libmisc/monitor/mon-monitor.c
+libcpukit_a_SOURCES += libmisc/monitor/mon-object.c
+libcpukit_a_SOURCES += libmisc/monitor/mon-part.c
+libcpukit_a_SOURCES += libmisc/monitor/mon-prmisc.c
+libcpukit_a_SOURCES += libmisc/monitor/mon-queue.c
+libcpukit_a_SOURCES += libmisc/monitor/mon-region.c
+libcpukit_a_SOURCES += libmisc/monitor/mon-sema.c
+libcpukit_a_SOURCES += libmisc/monitor/mon-server.c
+libcpukit_a_SOURCES += libmisc/monitor/mon-symbols.c
+libcpukit_a_SOURCES += libmisc/monitor/mon-task.c
+libcpukit_a_SOURCES += libmisc/mouse/mouse_parser.c
+libcpukit_a_SOURCES += libmisc/mouse/serial_mouse.c
+libcpukit_a_SOURCES += libmisc/redirector/stdio-redirect.c
+libcpukit_a_SOURCES += libmisc/rtems-fdt/rtems-fdt.c
+libcpukit_a_SOURCES += libmisc/rtems-fdt/rtems-fdt-shell.c
+libcpukit_a_SOURCES += libmisc/stackchk/check.c
+libcpukit_a_SOURCES += libmisc/stringto/stringtodouble.c
+libcpukit_a_SOURCES += libmisc/stringto/stringtofloat.c
+libcpukit_a_SOURCES += libmisc/stringto/stringtoint.c
+libcpukit_a_SOURCES += libmisc/stringto/stringtolong.c
+libcpukit_a_SOURCES += libmisc/stringto/stringtolongdouble.c
+libcpukit_a_SOURCES += libmisc/stringto/stringtolonglong.c
+libcpukit_a_SOURCES += libmisc/stringto/stringtopointer.c
+libcpukit_a_SOURCES += libmisc/stringto/stringtounsignedchar.c
+libcpukit_a_SOURCES += libmisc/stringto/stringtounsignedint.c
+libcpukit_a_SOURCES += libmisc/stringto/stringtounsignedlong.c
+libcpukit_a_SOURCES += libmisc/stringto/stringtounsignedlonglong.c
+libcpukit_a_SOURCES += libmisc/testsupport/testbeginend.c
+libcpukit_a_SOURCES += libmisc/testsupport/testbusy.c
+libcpukit_a_SOURCES += libmisc/testsupport/testextension.c
+libcpukit_a_SOURCES += libmisc/testsupport/testparallel.c
+libcpukit_a_SOURCES += libmisc/testsupport/testwrappers.c
+libcpukit_a_SOURCES += libmisc/untar/untar.c
+libcpukit_a_SOURCES += libmisc/untar/untar_tgz.c
+libcpukit_a_SOURCES += libmisc/untar/untar_txz.c
+libcpukit_a_SOURCES += libmisc/uuid/clear.c
+libcpukit_a_SOURCES += libmisc/uuid/compare.c
+libcpukit_a_SOURCES += libmisc/uuid/copy.c
+libcpukit_a_SOURCES += libmisc/uuid/gen_uuid.c
+libcpukit_a_SOURCES += libmisc/uuid/isnull.c
+libcpukit_a_SOURCES += libmisc/uuid/pack.c
+libcpukit_a_SOURCES += libmisc/uuid/parse.c
+libcpukit_a_SOURCES += libmisc/uuid/unpack.c
+libcpukit_a_SOURCES += libmisc/uuid/unparse.c
+libcpukit_a_SOURCES += libmisc/uuid/uuid_time.c
+libcpukit_a_SOURCES += libmisc/xz/xz_crc32.c
+libcpukit_a_SOURCES += libmisc/xz/xz_dec_lzma2.c
+libcpukit_a_SOURCES += libmisc/xz/xz_dec_stream.c
 libcpukit_a_SOURCES += libfs/src/defaults/default_are_nodes_equal.c
 libcpukit_a_SOURCES += libfs/src/defaults/default_chown.c
 libcpukit_a_SOURCES += libfs/src/defaults/default_clone.c
@@ -862,6 +940,7 @@ libcpukit_a_SOURCES += sapi/src/version.c
 
 if HAS_MP
 
+libcpukit_a_SOURCES += libmisc/monitor/mon-mpci.c
 libcpukit_a_SOURCES += rtems/src/eventmp.c
 libcpukit_a_SOURCES += rtems/src/mp.c
 libcpukit_a_SOURCES += rtems/src/msgmp.c
@@ -1095,6 +1174,7 @@ endif
 
 if LIBNETWORKING
 
+libcpukit_a_SOURCES += libmisc/monitor/mon-network.c
 libcpukit_a_SOURCES += libnetworking/kern/kern_mib.c
 libcpukit_a_SOURCES += libnetworking/kern/kern_subr.c
 libcpukit_a_SOURCES += libnetworking/kern/kern_sysctl.c
@@ -1289,6 +1369,140 @@ libcpukit_a_SOURCES += libpci/pci_print.c
 
 endif
 
+if LIBSHELL
+
+libcpukit_a_SOURCES += libmisc/shell/cat_file.c
+libcpukit_a_SOURCES += libmisc/shell/cmds.c
+libcpukit_a_SOURCES += libmisc/shell/main_alias.c
+libcpukit_a_SOURCES += libmisc/shell/main_cat.c
+libcpukit_a_SOURCES += libmisc/shell/main_cd.c
+libcpukit_a_SOURCES += libmisc/shell/cmp-ls.c
+libcpukit_a_SOURCES += libmisc/shell/main_chdir.c
+libcpukit_a_SOURCES += libmisc/shell/main_chmod.c
+libcpukit_a_SOURCES += libmisc/shell/main_chroot.c
+libcpukit_a_SOURCES += libmisc/shell/main_cp.c
+libcpukit_a_SOURCES += libmisc/shell/main_cpuuse.c
+libcpukit_a_SOURCES += libmisc/shell/main_date.c
+libcpukit_a_SOURCES += libmisc/shell/main_dir.c
+libcpukit_a_SOURCES += libmisc/shell/main_echo.c
+libcpukit_a_SOURCES += libmisc/shell/main_exit.c
+libcpukit_a_SOURCES += libmisc/shell/main_halt.c
+libcpukit_a_SOURCES += libmisc/shell/main_help.c
+libcpukit_a_SOURCES += libmisc/shell/main_id.c
+libcpukit_a_SOURCES += libmisc/shell/main_logoff.c
+libcpukit_a_SOURCES += libmisc/shell/main_ln.c
+libcpukit_a_SOURCES += libmisc/shell/main_ls.c
+libcpukit_a_SOURCES += libmisc/shell/main_mallocinfo.c
+libcpukit_a_SOURCES += libmisc/shell/main_md5.c
+libcpukit_a_SOURCES += libmisc/shell/main_mdump.c
+libcpukit_a_SOURCES += libmisc/shell/main_medit.c
+libcpukit_a_SOURCES += libmisc/shell/main_mfill.c
+libcpukit_a_SOURCES += libmisc/shell/main_mkdir.c
+libcpukit_a_SOURCES += libmisc/shell/main_mount.c
+libcpukit_a_SOURCES += libmisc/shell/main_mmove.c
+libcpukit_a_SOURCES += libmisc/shell/main_msdosfmt.c
+libcpukit_a_SOURCES += libmisc/shell/main_mv.c
+libcpukit_a_SOURCES += libmisc/shell/main_perioduse.c
+libcpukit_a_SOURCES += libmisc/shell/main_top.c
+libcpukit_a_SOURCES += libmisc/shell/main_pwd.c
+libcpukit_a_SOURCES += libmisc/shell/main_rm.c
+libcpukit_a_SOURCES += libmisc/shell/main_rmdir.c
+libcpukit_a_SOURCES += libmisc/shell/main_sleep.c
+libcpukit_a_SOURCES += libmisc/shell/main_stackuse.c
+libcpukit_a_SOURCES += libmisc/shell/main_tty.c
+libcpukit_a_SOURCES += libmisc/shell/main_umask.c
+libcpukit_a_SOURCES += libmisc/shell/main_unmount.c
+libcpukit_a_SOURCES += libmisc/shell/main_blksync.c
+libcpukit_a_SOURCES += libmisc/shell/main_whoami.c
+libcpukit_a_SOURCES += libmisc/shell/shell.c
+libcpukit_a_SOURCES += libmisc/shell/shell_cmdset.c
+libcpukit_a_SOURCES += libmisc/shell/shell_getchar.c
+libcpukit_a_SOURCES += libmisc/shell/shell_getprompt.c
+libcpukit_a_SOURCES += libmisc/shell/shellconfig.c
+libcpukit_a_SOURCES += libmisc/shell/shell_makeargs.c
+libcpukit_a_SOURCES += libmisc/shell/filemode.c
+libcpukit_a_SOURCES += libmisc/shell/pwcache.c
+libcpukit_a_SOURCES += libmisc/shell/print-ls.c
+libcpukit_a_SOURCES += libmisc/shell/write_file.c
+libcpukit_a_SOURCES += libmisc/shell/utils-cp.c
+libcpukit_a_SOURCES += libmisc/shell/utils-ls.c
+libcpukit_a_SOURCES += libmisc/shell/err.c
+libcpukit_a_SOURCES += libmisc/shell/errx.c
+libcpukit_a_SOURCES += libmisc/shell/verr.c
+libcpukit_a_SOURCES += libmisc/shell/vis.c
+libcpukit_a_SOURCES += libmisc/shell/verrx.c
+libcpukit_a_SOURCES += libmisc/shell/vwarn.c
+libcpukit_a_SOURCES += libmisc/shell/vwarnx.c
+libcpukit_a_SOURCES += libmisc/shell/warn.c
+libcpukit_a_SOURCES += libmisc/shell/warnx.c
+libcpukit_a_SOURCES += libmisc/shell/fts.c
+libcpukit_a_SOURCES += libmisc/shell/print_heapinfo.c
+libcpukit_a_SOURCES += libmisc/shell/main_wkspaceinfo.c
+libcpukit_a_SOURCES += libmisc/shell/shell_script.c
+libcpukit_a_SOURCES += libmisc/shell/login_prompt.c
+libcpukit_a_SOURCES += libmisc/shell/login_check.c
+libcpukit_a_SOURCES += libmisc/shell/fdisk.c
+libcpukit_a_SOURCES += libmisc/shell/main_rtc.c
+libcpukit_a_SOURCES += libmisc/shell/dd-args.c
+libcpukit_a_SOURCES += libmisc/shell/main_dd.c
+libcpukit_a_SOURCES += libmisc/shell/dd-conv.c
+libcpukit_a_SOURCES += libmisc/shell/dd-conv_tab.c
+libcpukit_a_SOURCES += libmisc/shell/dd-misc.c
+libcpukit_a_SOURCES += libmisc/shell/dd-position.c
+libcpukit_a_SOURCES += libmisc/shell/main_hexdump.c
+libcpukit_a_SOURCES += libmisc/shell/hexdump-conv.c
+libcpukit_a_SOURCES += libmisc/shell/hexdump-display.c
+libcpukit_a_SOURCES += libmisc/shell/hexdump-odsyntax.c
+libcpukit_a_SOURCES += libmisc/shell/hexdump-parse.c
+libcpukit_a_SOURCES += libmisc/shell/hexsyntax.c
+libcpukit_a_SOURCES += libmisc/shell/main_time.c
+libcpukit_a_SOURCES += libmisc/shell/main_mknod.c
+libcpukit_a_SOURCES += libmisc/shell/main_setenv.c
+libcpukit_a_SOURCES += libmisc/shell/main_getenv.c
+libcpukit_a_SOURCES += libmisc/shell/main_unsetenv.c
+libcpukit_a_SOURCES += libmisc/shell/main_mkrfs.c
+libcpukit_a_SOURCES += libmisc/shell/main_debugrfs.c
+libcpukit_a_SOURCES += libmisc/shell/main_df.c
+libcpukit_a_SOURCES += libmisc/shell/main_lsof.c
+libcpukit_a_SOURCES += libmisc/shell/main_edit.c
+libcpukit_a_SOURCES += libmisc/shell/main_blkstats.c
+libcpukit_a_SOURCES += libmisc/shell/main_rtrace.c
+libcpukit_a_SOURCES += libmisc/shell/shell-wait-for-input.c
+libcpukit_a_SOURCES += libmisc/shell/main_cmdls.c
+libcpukit_a_SOURCES += libmisc/shell/main_cmdchown.c
+libcpukit_a_SOURCES += libmisc/shell/main_cmdchmod.c
+libcpukit_a_SOURCES += libmisc/shell/main_cpuinfo.c
+libcpukit_a_SOURCES += libmisc/shell/main_profreport.c
+
+if LIBDRVMGR
+
+libcpukit_a_SOURCES += libmisc/shell/main_drvmgr.c
+
+endif
+
+if LIBPCI
+
+libcpukit_a_SOURCES += libmisc/shell/main_pci.c
+
+endif
+
+if LIBNETWORKING
+
+libcpukit_a_SOURCES += libmisc/shell/main_ifconfig.c
+libcpukit_a_SOURCES += libmisc/shell/main_route.c
+libcpukit_a_SOURCES += libmisc/shell/main_netstats.c
+libcpukit_a_SOURCES += libmisc/shell/main_ping.c
+
+endif
+
+endif
+
+if LIBUTF8PROC
+
+libcpukit_a_SOURCES += libmisc/utf8proc/utf8proc.c
+
+endif
+
 if SHA
 
 libcpukit_a_SOURCES += libmd/sha256c.c
@@ -1332,7 +1546,6 @@ all-local: generate-vc-key
 # librtemscpu
 _SUBDIRS = . score
 _SUBDIRS += libnetworking
-_SUBDIRS += libmisc
 _SUBDIRS += wrapup
 
 project_lib_LIBRARIES += libftpd.a
diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index 11d0af6461..7619a78c93 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -496,7 +496,6 @@ score/cpu/v850/Makefile
 score/cpu/x86_64/Makefile
 score/cpu/no_cpu/Makefile
 libnetworking/Makefile
-libmisc/Makefile
 wrapup/Makefile])
 
 AC_OUTPUT
diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am
deleted file mode 100644
index 867013b371..0000000000
--- a/cpukit/libmisc/Makefile.am
+++ /dev/null
@@ -1,199 +0,0 @@
-##
-##
-
-include $(top_srcdir)/automake/compile.am
-
-
-noinst_LIBRARIES =
-
-## bspcmdline
-noinst_LIBRARIES += libbspcmdline.a
-libbspcmdline_a_SOURCES = bspcmdline/bspcmdline_get.c \
-    bspcmdline/bspcmdline_getparam.c bspcmdline/bspcmdline_getparamraw.c \
-    bspcmdline/bspcmdline_getparamrhs.c
-
-## capture
-
-noinst_LIBRARIES += libcapture.a
-libcapture_a_SOURCES = capture/capture.c capture/capture-cli.c \
-    capture/capture_user_extension.c capture/capture_buffer.c \
-    capture/capture_support.c \
-    capture/capture.h capture/captureimpl.h capture/capture-cli.h \
-    capture/capture_buffer.h \
-    capture/rtems-trace-buffer-vars.c capture/rtems-trace-buffer-vars.h
-
-## cpuuse
-
-noinst_LIBRARIES += libcpuuse.a
-libcpuuse_a_SOURCES = cpuuse/cpuusagereport.c cpuuse/cpuusagereset.c \
-     cpuuse/cpuuse.h cpuuse/cpuusagedata.c cpuuse/cpuusagetop.c
-libcpuuse_a_SOURCES += cpuuse/cpuinforeport.c
-
-## devnull
-noinst_LIBRARIES += libdevnull.a
-libdevnull_a_SOURCES = devnull/devnull.c devnull/devnull.h \
-    devnull/devzero.c devnull/devzero.h
-
-noinst_LIBRARIES += libdummy.a
-libdummy_a_SOURCES = dummy/default-configuration.c dummy/dummy-networking.c
-
-## dumpbuf
-noinst_LIBRARIES += libdumpbuf.a
-libdumpbuf_a_SOURCES = dumpbuf/dumpbuf.c dumpbuf/dumpbuf.h
-
-## monitor
-noinst_LIBRARIES += libmonitor.a
-libmonitor_a_SOURCES = monitor/mon-command.c monitor/mon-symbols.c \
-    monitor/mon-prmisc.c monitor/mon-monitor.c monitor/mon-object.c \
-    monitor/mon-server.c monitor/mon-task.c monitor/mon-queue.c \
-    monitor/mon-driver.c monitor/mon-itask.c monitor/mon-extension.c \
-    monitor/mon-manager.c monitor/mon-config.c monitor/mon-part.c \
-    monitor/mon-region.c monitor/mon-sema.c monitor/mon-editor.c \
-    monitor/symbols.h monitor/monitor.h
-if LIBNETWORKING
-libmonitor_a_SOURCES += monitor/mon-network.c
-endif
-if HAS_MP
-libmonitor_a_SOURCES += monitor/mon-mpci.c
-endif
-
-
-## fb
-noinst_LIBRARIES += libmw-fb.a
-libmw_fb_a_SOURCES = fb/mw_print.c fb/mw_uid.c fb/fb.h fb/mw_uid.h
-
-## rtems-fdt
-noinst_LIBRARIES += librtemsfdt.a
-librtemsfdt_a_SOURCES = rtems-fdt/rtems-fdt-shell.c rtems-fdt/rtems-fdt-shell.h \
-    rtems-fdt/rtems-fdt.c rtems-fdt/rtems-fdt.h
-
-## mouse
-noinst_LIBRARIES += libmouse.a
-libmouse_a_SOURCES = mouse/mouse_parser.c mouse/serial_mouse.c
-
-## redirector
-noinst_LIBRARIES += libredirector.a
-libredirector_a_SOURCES = redirector/stdio-redirect.c redirector/stdio-redirect.h
-
-## shell
-if LIBSHELL
-noinst_LIBRARIES += libshell.a
-libshell_a_SOURCES = shell/cat_file.c shell/cmds.c shell/internal.h \
-    shell/main_alias.c shell/main_cat.c shell/main_cd.c shell/cmp-ls.c \
-    shell/main_chdir.c shell/main_chmod.c shell/main_chroot.c \
-    shell/main_cp.c shell/main_cpuuse.c shell/main_date.c shell/main_dir.c \
-    shell/main_echo.c shell/main_exit.c shell/main_halt.c shell/main_help.c \
-    shell/main_id.c shell/main_logoff.c shell/main_ln.c shell/main_ls.c \
-    shell/main_mallocinfo.c shell/main_md5.c shell/main_mdump.c \
-    shell/main_medit.c shell/main_mfill.c shell/main_mkdir.c \
-    shell/main_mount.c shell/main_mmove.c shell/main_msdosfmt.c \
-    shell/main_mv.c shell/main_perioduse.c shell/main_top.c \
-    shell/main_pwd.c shell/main_rm.c shell/main_rmdir.c shell/main_sleep.c \
-    shell/main_stackuse.c shell/main_tty.c shell/main_umask.c \
-    shell/main_unmount.c shell/main_blksync.c shell/main_whoami.c \
-    shell/shell.c shell/shell_cmdset.c shell/shell_getchar.c \
-    shell/shell_getprompt.c shell/shellconfig.c \
-    shell/shellconfig.h shell/shell.h shell/shell_makeargs.c \
-    shell/filemode.c shell/pwcache.c shell/print-ls.c \
-    shell/write_file.c shell/utils-cp.c  shell/utils-ls.c \
-    shell/err.c shell/errx.c shell/verr.c shell/vis.c \
-    shell/verrx.c shell/vwarn.c shell/vwarnx.c shell/warn.c shell/warnx.c \
-    shell/fts.c shell/print_heapinfo.c shell/main_wkspaceinfo.c \
-    shell/shell_script.c shell/login_prompt.c shell/login_check.c \
-    shell/fdisk.c shell/main_rtc.c \
-    shell/dd-args.c shell/main_dd.c shell/dd-conv.c shell/dd-conv_tab.c \
-    shell/dd-misc.c shell/dd-position.c \
-    shell/main_hexdump.c shell/hexdump-conv.c shell/hexdump-display.c \
-    shell/hexdump-odsyntax.c shell/hexdump-parse.c shell/hexsyntax.c \
-    shell/main_time.c shell/main_mknod.c \
-    shell/main_setenv.c shell/main_getenv.c shell/main_unsetenv.c \
-    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
-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_cpuinfo.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 \
-    shell/main_ping.c
-endif
-endif
-
-
-## serdbg
-
-if LIBSERDBG
-noinst_LIBRARIES += libserdbg.a
-libserdbg_a_SOURCES = serdbg/serdbg.c serdbg/serdbgio.c \
-    serdbg/termios_printk.c serdbg/serdbgcnf.h serdbg/serdbg.h \
-    serdbg/termios_printk_cnf.h serdbg/termios_printk.h
-endif
-
-
-## stackchk
-noinst_LIBRARIES += libstackchk.a
-libstackchk_a_SOURCES = stackchk/check.c \
-    stackchk/stackchk.h
-
-
-## libuntar
-noinst_LIBRARIES += libuntar.a
-libuntar_a_SOURCES = untar/untar.c untar/untar_txz.c untar/untar_tgz.c \
-	untar/untar.h
-
-
-## stringto
-noinst_LIBRARIES += libstringto.a
-libstringto_a_SOURCES = stringto/stringtodouble.c stringto/stringtofloat.c \
-    stringto/stringtolongdouble.c \
-    stringto/stringtoint.c stringto/stringtolong.c stringto/stringtolonglong.c \
-    stringto/stringtopointer.c stringto/stringtounsignedint.c \
-    stringto/stringtounsignedchar.c stringto/stringtounsignedlong.c \
-    stringto/stringtounsignedlonglong.c
-
-## testsupport
-noinst_LIBRARIES += libtestsupport.a
-libtestsupport_a_SOURCES =
-libtestsupport_a_SOURCES += testsupport/testbeginend.c
-libtestsupport_a_SOURCES += testsupport/testbusy.c
-libtestsupport_a_SOURCES += testsupport/testextension.c
-libtestsupport_a_SOURCES += testsupport/testparallel.c
-libtestsupport_a_SOURCES += testsupport/testwrappers.c
-
-## fsmount
-noinst_LIBRARIES += libfsmount.a
-libfsmount_a_SOURCES = fsmount/fsmount.c fsmount/fsmount.h
-
-## utf8proc
-if LIBUTF8PROC
-noinst_LIBRARIES += libutf8proc.a
-libutf8proc_a_SOURCES = utf8proc/utf8proc.c
-endif
-
-## uuid
-noinst_LIBRARIES += libuuid.a
-libuuid_a_SOURCES = uuid/clear.c uuid/compare.c uuid/copy.c uuid/gen_uuid.c \
-	uuid/isnull.c uuid/pack.c uuid/parse.c uuid/unpack.c uuid/unparse.c \
-	uuid/uuid_time.c uuid/uuidd.h uuid/uuidP.h
-
-## xz-embedded
-noinst_LIBRARIES += libxz.a
-libxz_a_SOURCES = xz/xz/h xz/xz_crc32.c \
-	xz/xz_dec_lzma2.c xz/xz_dec_stream.c
-
-
-## ---
-include $(top_srcdir)/automake/local.am
diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am
index 025386b296..8286752fba 100644
--- a/cpukit/wrapup/Makefile.am
+++ b/cpukit/wrapup/Makefile.am
@@ -16,41 +16,6 @@ TMP_LIBS =
 TMP_LIBS += ../score/cpu/@RTEMS_CPU@/libscorecpu.a
 TMP_LIBS += ../libcpukit.a
 
-TMP_LIBS += ../libmisc/libmonitor.a
-TMP_LIBS += ../libmisc/libuntar.a
-TMP_LIBS += ../libmisc/libstackchk.a
-TMP_LIBS += ../libmisc/libcpuuse.a
-
-## XXX temporarily removed because it causes a
-## XXX number of BSPs to not link "main(){}" used by autoconf
-# if LIBSERDBG
-# TMP_LIBS += ../libmisc/libserdbg.a
-# endif
-
-if LIBSHELL
-TMP_LIBS += ../libmisc/libshell.a
-endif
-
-TMP_LIBS += ../libmisc/libbspcmdline.a
-TMP_LIBS += ../libmisc/libcapture.a
-TMP_LIBS += ../libmisc/libdumpbuf.a
-TMP_LIBS += ../libmisc/libdevnull.a
-TMP_LIBS += ../libmisc/libdummy.a
-TMP_LIBS += ../libmisc/libfsmount.a
-TMP_LIBS += ../libmisc/libmouse.a
-TMP_LIBS += ../libmisc/libmw-fb.a
-TMP_LIBS += ../libmisc/libredirector.a
-TMP_LIBS += ../libmisc/librtemsfdt.a
-TMP_LIBS += ../libmisc/libstringto.a
-TMP_LIBS += ../libmisc/libtestsupport.a
-
-if LIBUTF8PROC
-TMP_LIBS += ../libmisc/libutf8proc.a
-endif
-
-TMP_LIBS += ../libmisc/libuuid.a
-TMP_LIBS += ../libmisc/libxz.a
-
 librtemscpu.a: $(TMP_LIBS)
 	$(AM_V_GEN)rm -f $@
 	$(AM_V_GEN)$(MKDIR_P) $(ARCH)
-- 
2.16.4

More information about the devel mailing list