From 8d677cf009cc496d1c851c28780b0ff713ad7289 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 14 Sep 2018 06:35:59 +0200 Subject: build: Merge libgnat/Makefile.am --- cpukit/Makefile.am | 8 +++++++- cpukit/configure.ac | 1 - cpukit/libgnat/Makefile.am | 10 ---------- cpukit/wrapup/Makefile.am | 4 ---- 4 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 cpukit/libgnat/Makefile.am diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index a64807bc8c..8057bd0aee 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -478,6 +478,13 @@ libcpukit_a_SOURCES += libdrvmgr/drvmgr_unregister.c endif +if LIBGNAT + +libcpukit_a_SOURCES += libgnat/ada_intrsupp.c +libcpukit_a_SOURCES += libgnat/adasupp.c + +endif + # # Create a new Version VC Key header if the VC state has changed. # @@ -518,7 +525,6 @@ _SUBDIRS += libpci _SUBDIRS += libi2c _SUBDIRS += libmisc _SUBDIRS += libmd -_SUBDIRS += libgnat _SUBDIRS += libstdthreads _SUBDIRS += wrapup diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 24a7228c67..7d93780fb2 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -497,7 +497,6 @@ score/cpu/v850/Makefile score/cpu/x86_64/Makefile score/cpu/no_cpu/Makefile posix/Makefile -libgnat/Makefile libnetworking/Makefile libpci/Makefile librpc/Makefile diff --git a/cpukit/libgnat/Makefile.am b/cpukit/libgnat/Makefile.am deleted file mode 100644 index 87adb67ccd..0000000000 --- a/cpukit/libgnat/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -include $(top_srcdir)/automake/compile.am - - -if LIBGNAT -noinst_LIBRARIES = libgnat.a - -libgnat_a_SOURCES = ada_intrsupp.c adasupp.c -endif - -include $(top_srcdir)/automake/local.am diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am index 722cb5913d..84ebb7dd95 100644 --- a/cpukit/wrapup/Makefile.am +++ b/cpukit/wrapup/Makefile.am @@ -19,10 +19,6 @@ TMP_LIBS += ../libcpukit.a TMP_LIBS += ../rtems/librtems.a TMP_LIBS += ../posix/libposix.a -if LIBGNAT -TMP_LIBS += ../libgnat/libgnat.a -endif - TMP_LIBS += ../libstdthreads/libstdthreads.a TMP_LIBS += ../libmisc/libmonitor.a -- cgit v1.2.3