diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-09-14 06:41:27 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-10-10 07:53:32 +0200 |
| commit | e39642a468fedd4b24955a9ee72734b5c6cd2d47 (patch) | |
| tree | 5726265a9ee3c8f7c0cdb7c7ace06ed91169c6b9 /cpukit | |
| parent | build: Merge libi2c/Makefile.am (diff) | |
| download | rtems-e39642a468fedd4b24955a9ee72734b5c6cd2d47.tar.bz2 | |
build: Merge libmd/Makefile.am
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/Makefile.am | 10 | ||||
| -rw-r--r-- | cpukit/configure.ac | 1 | ||||
| -rw-r--r-- | cpukit/libmd/Makefile.am | 14 | ||||
| -rw-r--r-- | cpukit/wrapup/Makefile.am | 4 |
4 files changed, 9 insertions, 20 deletions
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 3ad7a3cd38..5c1296f1e3 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -362,6 +362,8 @@ libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-rtems-utils.c libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-shell.c libcpukit_a_SOURCES += libfs/src/rfs/rtems-rfs-trace.c libcpukit_a_SOURCES += libi2c/libi2c.c +libcpukit_a_SOURCES += libmd/md4.c +libcpukit_a_SOURCES += libmd/md5.c libcpukit_a_SOURCES += sapi/src/chainappendnotify.c libcpukit_a_SOURCES += sapi/src/chaingetnotify.c libcpukit_a_SOURCES += sapi/src/chaingetwait.c @@ -486,6 +488,13 @@ libcpukit_a_SOURCES += libgnat/adasupp.c endif +if SHA + +libcpukit_a_SOURCES += libmd/sha256c.c +libcpukit_a_SOURCES += libmd/sha512c.c + +endif + # # Create a new Version VC Key header if the VC state has changed. # @@ -524,7 +533,6 @@ _SUBDIRS = . score rtems posix _SUBDIRS += libnetworking librpc _SUBDIRS += libpci _SUBDIRS += libmisc -_SUBDIRS += libmd _SUBDIRS += libstdthreads _SUBDIRS += wrapup diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 38b677b21e..edc2ac9410 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -501,7 +501,6 @@ libnetworking/Makefile libpci/Makefile librpc/Makefile libmisc/Makefile -libmd/Makefile libstdthreads/Makefile zlib/Makefile telnetd/Makefile diff --git a/cpukit/libmd/Makefile.am b/cpukit/libmd/Makefile.am deleted file mode 100644 index ce502f2265..0000000000 --- a/cpukit/libmd/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -include $(top_srcdir)/automake/compile.am - -if NEWLIB -noinst_LIBRARIES = libmd.a -libmd_a_SOURCES = -libmd_a_SOURCES += md4.c -libmd_a_SOURCES += md5.c -if SHA -libmd_a_SOURCES += sha256c.c -libmd_a_SOURCES += sha512c.c -endif -endif - -include $(top_srcdir)/automake/local.am diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am index 6aeb657f83..3771f9b010 100644 --- a/cpukit/wrapup/Makefile.am +++ b/cpukit/wrapup/Makefile.am @@ -66,10 +66,6 @@ TMP_LIBS += ../librpc/librpc.a TMP_LIBS += ../librpc/libxdr.a endif -if NEWLIB -TMP_LIBS += ../libmd/libmd.a -endif - librtemscpu.a: $(TMP_LIBS) $(AM_V_GEN)rm -f $@ $(AM_V_GEN)$(MKDIR_P) $(ARCH) |