From 68e1ccc46d82b87b41199b3dcc4ed72cd3c14960 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 11 Sep 2018 06:30:20 +0200 Subject: build: Remove specialized CPPFLAGS --- cpukit/dtc/libfdt/Makefile.am | 1 - cpukit/libcrypt/Makefile.am | 2 -- cpukit/libcsupport/Makefile.am | 2 -- cpukit/libmd/Makefile.am | 1 - cpukit/libmisc/Makefile.am | 1 - cpukit/librpc/Makefile.am | 2 -- cpukit/libstdthreads/Makefile.am | 1 - cpukit/mghttpd/Makefile.am | 2 -- cpukit/posix/Makefile.am | 1 - cpukit/pppd/Makefile.am | 1 - cpukit/rtems/Makefile.am | 1 - cpukit/score/Makefile.am | 1 - cpukit/score/cpu/arm/Makefile.am | 1 - cpukit/score/cpu/bfin/Makefile.am | 1 - cpukit/score/cpu/epiphany/Makefile.am | 2 -- cpukit/score/cpu/i386/Makefile.am | 1 - cpukit/score/cpu/lm32/Makefile.am | 1 - cpukit/score/cpu/m32c/Makefile.am | 1 - cpukit/score/cpu/m68k/Makefile.am | 1 - cpukit/score/cpu/mips/Makefile.am | 1 - cpukit/score/cpu/moxie/Makefile.am | 1 - cpukit/score/cpu/nios2/Makefile.am | 2 -- cpukit/score/cpu/no_cpu/Makefile.am | 1 - cpukit/score/cpu/or1k/Makefile.am | 2 -- cpukit/score/cpu/powerpc/Makefile.am | 1 - cpukit/score/cpu/riscv/Makefile.am | 1 - cpukit/score/cpu/sh/Makefile.am | 1 - cpukit/score/cpu/v850/Makefile.am | 1 - cpukit/score/cpu/x86_64/Makefile.am | 1 - cpukit/telnetd/Makefile.am | 1 - 30 files changed, 37 deletions(-) (limited to 'cpukit') diff --git a/cpukit/dtc/libfdt/Makefile.am b/cpukit/dtc/libfdt/Makefile.am index 0782303891..012923861d 100644 --- a/cpukit/dtc/libfdt/Makefile.am +++ b/cpukit/dtc/libfdt/Makefile.am @@ -2,7 +2,6 @@ include $(top_srcdir)/automake/compile.am noinst_LIBRARIES = libfdt.a -libfdt_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir) libfdt_a_SOURCES = libfdt_a_SOURCES += fdt_addresses.c libfdt_a_SOURCES += fdt.c diff --git a/cpukit/libcrypt/Makefile.am b/cpukit/libcrypt/Makefile.am index cb8dbe129a..5aecfe131f 100644 --- a/cpukit/libcrypt/Makefile.am +++ b/cpukit/libcrypt/Makefile.am @@ -2,8 +2,6 @@ include $(top_srcdir)/automake/compile.am noinst_LIBRARIES = libcrypt.a -libcrypt_a_CPPFLAGS = $(AM_CPPFLAGS) - libcrypt_a_SOURCES = libcrypt_a_SOURCES += crypt.c libcrypt_a_SOURCES += crypt-md5.c diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am index e59dfd586b..00bbdfc9b9 100644 --- a/cpukit/libcsupport/Makefile.am +++ b/cpukit/libcsupport/Makefile.am @@ -2,8 +2,6 @@ include $(top_srcdir)/automake/multilib.am include $(top_srcdir)/automake/compile.am noinst_LIBRARIES = libcsupport.a libcalloc.a -libcsupport_a_CPPFLAGS = $(AM_CPPFLAGS) -libcalloc_a_CPPFLAGS = $(AM_CPPFLAGS) ## rtems ## General stuff diff --git a/cpukit/libmd/Makefile.am b/cpukit/libmd/Makefile.am index b56aff7ca5..ce502f2265 100644 --- a/cpukit/libmd/Makefile.am +++ b/cpukit/libmd/Makefile.am @@ -9,7 +9,6 @@ if SHA libmd_a_SOURCES += sha256c.c libmd_a_SOURCES += sha512c.c endif -libmd_a_CPPFLAGS = $(AM_CPPFLAGS) endif include $(top_srcdir)/automake/local.am diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am index c4cd9ae152..867013b371 100644 --- a/cpukit/libmisc/Makefile.am +++ b/cpukit/libmisc/Makefile.am @@ -157,7 +157,6 @@ libuntar_a_SOURCES = untar/untar.c untar/untar_txz.c untar/untar_tgz.c \ ## stringto noinst_LIBRARIES += libstringto.a -libstringto_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/stringto libstringto_a_SOURCES = stringto/stringtodouble.c stringto/stringtofloat.c \ stringto/stringtolongdouble.c \ stringto/stringtoint.c stringto/stringtolong.c stringto/stringtolonglong.c \ diff --git a/cpukit/librpc/Makefile.am b/cpukit/librpc/Makefile.am index b0af51bf70..7cdcfd818b 100644 --- a/cpukit/librpc/Makefile.am +++ b/cpukit/librpc/Makefile.am @@ -6,7 +6,6 @@ if LIBNETWORKING man_MANS = noinst_LIBRARIES = libxdr.a -libxdr_a_CPPFLAGS = $(AM_CPPFLAGS) libxdr_a_SOURCES = src/xdr/xdr.c src/xdr/xdr_array.c src/xdr/xdr_float.c \ src/xdr/xdr_mem.c src/xdr/xdr_rec.c src/xdr/xdr_reference.c \ @@ -19,7 +18,6 @@ if LIBNETWORKING man_MANS += $(libxdr_mans) noinst_LIBRARIES += librpc.a -librpc_a_CPPFLAGS = $(AM_CPPFLAGS) librpc_a_SOURCES = src/rpc/auth_none.c src/rpc/auth_unix.c \ src/rpc/authunix_prot.c src/rpc/bindresvport.c src/rpc/clnt_generic.c \ diff --git a/cpukit/libstdthreads/Makefile.am b/cpukit/libstdthreads/Makefile.am index 7d6192724d..1cb1bf0381 100644 --- a/cpukit/libstdthreads/Makefile.am +++ b/cpukit/libstdthreads/Makefile.am @@ -3,7 +3,6 @@ include $(top_srcdir)/automake/compile.am noinst_LIBRARIES = libstdthreads.a libstdthreads_a_CFLAGS = -std=c11 -libstdthreads_a_CPPFLAGS = $(AM_CPPFLAGS) libstdthreads_a_SOURCES = libstdthreads_a_SOURCES += call_once.c diff --git a/cpukit/mghttpd/Makefile.am b/cpukit/mghttpd/Makefile.am index 5058f8b85e..4f17609e29 100644 --- a/cpukit/mghttpd/Makefile.am +++ b/cpukit/mghttpd/Makefile.am @@ -8,8 +8,6 @@ $(PROJECT_LIB)/libmghttpd.a: libmghttpd.a $(INSTALL_DATA) $< $(PROJECT_LIB)/libmghttpd.a TMPINSTALL_FILES = $(PROJECT_LIB)/libmghttpd.a -libmghttpd_a_CPPFLAGS = $(AM_CPPFLAGS) - libmghttpd_a_SOURCES = mongoose.c mongoose.h endif endif diff --git a/cpukit/posix/Makefile.am b/cpukit/posix/Makefile.am index 12d7c0def4..a59affc507 100644 --- a/cpukit/posix/Makefile.am +++ b/cpukit/posix/Makefile.am @@ -3,7 +3,6 @@ include $(top_srcdir)/automake/compile.am noinst_LIBRARIES = libposix.a -libposix_a_CPPFLAGS = $(AM_CPPFLAGS) libposix_a_SOURCES = # Some POSIX functions that are nice to always have diff --git a/cpukit/pppd/Makefile.am b/cpukit/pppd/Makefile.am index 5fdfb5ef30..799b2a9556 100644 --- a/cpukit/pppd/Makefile.am +++ b/cpukit/pppd/Makefile.am @@ -12,7 +12,6 @@ libpppd_a_SOURCES = auth.c ccp.c ccp.h chap.c chap.h chap_ms.c chap_ms.h \ options.c upap.c upap.h utils.c sys-rtems.c \ rtemsmain.c rtemspppd.c rtemspppd.h pppd.h patchlevel.h pathnames.h \ rtemsdialer.h -libpppd_a_CPPFLAGS = $(AM_CPPFLAGS) endif include $(top_srcdir)/automake/local.am diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am index fdef7f8022..9a6f4a114c 100644 --- a/cpukit/rtems/Makefile.am +++ b/cpukit/rtems/Makefile.am @@ -2,7 +2,6 @@ include $(top_srcdir)/automake/multilib.am include $(top_srcdir)/automake/compile.am noinst_LIBRARIES = librtems.a -librtems_a_CPPFLAGS = $(AM_CPPFLAGS) # include diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index cdd9740d41..b89aab89f6 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -16,7 +16,6 @@ endif noinst_LIBRARIES = libscore.a libscore_a_SOURCES = -libscore_a_CPPFLAGS = $(AM_CPPFLAGS) # We only build multiprocessing related files if HAS_MP was defined if HAS_MP diff --git a/cpukit/score/cpu/arm/Makefile.am b/cpukit/score/cpu/arm/Makefile.am index 865a750477..b114d6bda3 100644 --- a/cpukit/score/cpu/arm/Makefile.am +++ b/cpukit/score/cpu/arm/Makefile.am @@ -1,6 +1,5 @@ include $(top_srcdir)/automake/compile.am noinst_LIBRARIES = libscorecpu.a -libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) libscorecpu_a_SOURCES = libscorecpu_a_SOURCES += __aeabi_read_tp.c libscorecpu_a_SOURCES += __tls_get_addr.c diff --git a/cpukit/score/cpu/bfin/Makefile.am b/cpukit/score/cpu/bfin/Makefile.am index 7febda59b6..151b4beb15 100644 --- a/cpukit/score/cpu/bfin/Makefile.am +++ b/cpukit/score/cpu/bfin/Makefile.am @@ -5,7 +5,6 @@ libscorecpu_a_SOURCES = cpu.c cpu_asm.S libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c libscorecpu_a_SOURCES += bfin-exception-frame-print.c -libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) include $(top_srcdir)/automake/local.am include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/epiphany/Makefile.am b/cpukit/score/cpu/epiphany/Makefile.am index 0c75bcdcd5..a0ab8ec64a 100644 --- a/cpukit/score/cpu/epiphany/Makefile.am +++ b/cpukit/score/cpu/epiphany/Makefile.am @@ -11,8 +11,6 @@ libscorecpu_a_SOURCES += epiphany-context-initialize.c libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c libscorecpu_a_SOURCES += setjmp.S -libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) - all-local: $(PREINSTALL_FILES) include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/i386/Makefile.am b/cpukit/score/cpu/i386/Makefile.am index faef1fbf04..e12a6652a3 100644 --- a/cpukit/score/cpu/i386/Makefile.am +++ b/cpukit/score/cpu/i386/Makefile.am @@ -5,7 +5,6 @@ libscorecpu_a_SOURCES = cpu.c cpu_asm.S libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c libscorecpu_a_SOURCES += ../no_cpu/cpuidle.c -libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) include $(top_srcdir)/automake/local.am include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/lm32/Makefile.am b/cpukit/score/cpu/lm32/Makefile.am index 795a6be283..b867dc0083 100644 --- a/cpukit/score/cpu/lm32/Makefile.am +++ b/cpukit/score/cpu/lm32/Makefile.am @@ -5,7 +5,6 @@ libscorecpu_a_SOURCES = cpu.c cpu_asm.S irq.c libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c libscorecpu_a_SOURCES += lm32-exception-frame-print.c -libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) include $(top_srcdir)/automake/local.am include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/m32c/Makefile.am b/cpukit/score/cpu/m32c/Makefile.am index 6695d35c77..596585a1ea 100644 --- a/cpukit/score/cpu/m32c/Makefile.am +++ b/cpukit/score/cpu/m32c/Makefile.am @@ -6,7 +6,6 @@ libscorecpu_a_SOURCES = cpu.c cpu_asm.c context_switch.S context_init.c \ libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c libscorecpu_a_SOURCES += m32c-exception-frame-print.c -libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) include $(top_srcdir)/automake/local.am include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/m68k/Makefile.am b/cpukit/score/cpu/m68k/Makefile.am index e02b4ab600..dea4d548b8 100644 --- a/cpukit/score/cpu/m68k/Makefile.am +++ b/cpukit/score/cpu/m68k/Makefile.am @@ -1,7 +1,6 @@ include $(top_srcdir)/automake/compile.am noinst_LIBRARIES = libscorecpu.a -libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) libscorecpu_a_SOURCES = cpu.c cpu_asm.S libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c diff --git a/cpukit/score/cpu/mips/Makefile.am b/cpukit/score/cpu/mips/Makefile.am index b03d8593c4..e61fc78924 100644 --- a/cpukit/score/cpu/mips/Makefile.am +++ b/cpukit/score/cpu/mips/Makefile.am @@ -4,7 +4,6 @@ noinst_LIBRARIES = libscorecpu.a libscorecpu_a_SOURCES = cpu.c cpu_asm.S libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c -libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) include $(top_srcdir)/automake/local.am include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/moxie/Makefile.am b/cpukit/score/cpu/moxie/Makefile.am index 93cf64b82e..8600eeb31f 100644 --- a/cpukit/score/cpu/moxie/Makefile.am +++ b/cpukit/score/cpu/moxie/Makefile.am @@ -9,7 +9,6 @@ libscorecpu_a_SOURCES = cpu.c moxie-exception-frame-print.c cpu_asm.S libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c libscorecpu_a_SOURCES += ../no_cpu/cpuidle.c -libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) include $(top_srcdir)/automake/local.am include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/nios2/Makefile.am b/cpukit/score/cpu/nios2/Makefile.am index 4619db0b28..0195a8e721 100644 --- a/cpukit/score/cpu/nios2/Makefile.am +++ b/cpukit/score/cpu/nios2/Makefile.am @@ -31,8 +31,6 @@ libscorecpu_a_SOURCES += nios2-mpu-disable-protected.c libscorecpu_a_SOURCES += nios2-mpu-reset.c libscorecpu_a_SOURCES += nios2-thread-dispatch-disabled.c -libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) - all-local: $(PREINSTALL_FILES) diff --git a/cpukit/score/cpu/no_cpu/Makefile.am b/cpukit/score/cpu/no_cpu/Makefile.am index b5f59e56f8..2a649d7907 100644 --- a/cpukit/score/cpu/no_cpu/Makefile.am +++ b/cpukit/score/cpu/no_cpu/Makefile.am @@ -5,7 +5,6 @@ libscorecpu_a_SOURCES = cpu.c cpu_asm.c libscorecpu_a_SOURCES += cpucounterfrequency.c libscorecpu_a_SOURCES += cpucounterread.c libscorecpu_a_SOURCES += cpuidle.c -libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) include $(top_srcdir)/automake/local.am include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/or1k/Makefile.am b/cpukit/score/cpu/or1k/Makefile.am index 732f7c3d69..9d7690d0e3 100644 --- a/cpukit/score/cpu/or1k/Makefile.am +++ b/cpukit/score/cpu/or1k/Makefile.am @@ -15,8 +15,6 @@ libscorecpu_a_SOURCES += or1k-exception-default.c libscorecpu_a_SOURCES += or1k-exception-frame-print.c libscorecpu_a_SOURCES += or1k-exception-handler-low.S -libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) - all-local: $(PREINSTALL_FILES) include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/cpu/powerpc/Makefile.am b/cpukit/score/cpu/powerpc/Makefile.am index 15736ab809..511317aa66 100644 --- a/cpukit/score/cpu/powerpc/Makefile.am +++ b/cpukit/score/cpu/powerpc/Makefile.am @@ -7,7 +7,6 @@ libscorecpu_a_SOURCES += ppc-context-volatile-clobber.S libscorecpu_a_SOURCES += ppc-context-validate.S libscorecpu_a_SOURCES += ppc-isr-disable-mask.S libscorecpu_a_SOURCES += ppc-isr-vector-install.c -libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) include $(top_srcdir)/automake/local.am include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/riscv/Makefile.am b/cpukit/score/cpu/riscv/Makefile.am index bf1c43f01d..3aa992d135 100644 --- a/cpukit/score/cpu/riscv/Makefile.am +++ b/cpukit/score/cpu/riscv/Makefile.am @@ -1,6 +1,5 @@ include $(top_srcdir)/automake/compile.am noinst_LIBRARIES = libscorecpu.a -libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) libscorecpu_a_SOURCES = cpu.c libscorecpu_a_SOURCES += riscv-exception-handler.S libscorecpu_a_SOURCES += riscv-exception-frame-print.c diff --git a/cpukit/score/cpu/sh/Makefile.am b/cpukit/score/cpu/sh/Makefile.am index b4a125fd81..8b1a0da3a8 100644 --- a/cpukit/score/cpu/sh/Makefile.am +++ b/cpukit/score/cpu/sh/Makefile.am @@ -6,7 +6,6 @@ libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c libscorecpu_a_SOURCES += ../no_cpu/cpuidle.c libscorecpu_a_SOURCES += sh-exception-frame-print.c -libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) include $(top_srcdir)/automake/local.am include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/v850/Makefile.am b/cpukit/score/cpu/v850/Makefile.am index 3e3e8ae94f..1e27f61af9 100644 --- a/cpukit/score/cpu/v850/Makefile.am +++ b/cpukit/score/cpu/v850/Makefile.am @@ -7,7 +7,6 @@ libscorecpu_a_SOURCES += ../no_cpu/cpucounterfrequency.c libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c libscorecpu_a_SOURCES += ../no_cpu/cpuidle.c libscorecpu_a_SOURCES += v850-exception-frame-print.c -libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) include $(top_srcdir)/automake/local.am include $(srcdir)/headers.am diff --git a/cpukit/score/cpu/x86_64/Makefile.am b/cpukit/score/cpu/x86_64/Makefile.am index 556246d9f7..45fbca7da5 100644 --- a/cpukit/score/cpu/x86_64/Makefile.am +++ b/cpukit/score/cpu/x86_64/Makefile.am @@ -7,7 +7,6 @@ libscorecpu_a_SOURCES += ../no_cpu/cpucounterread.c libscorecpu_a_SOURCES += ../no_cpu/cpuidle.c libscorecpu_a_SOURCES += x86_64-context-initialize.c libscorecpu_a_SOURCES += x86_64-context-switch.S -libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS) include $(top_srcdir)/automake/local.am include $(srcdir)/headers.am diff --git a/cpukit/telnetd/Makefile.am b/cpukit/telnetd/Makefile.am index 7051b368c3..7d9e543e67 100644 --- a/cpukit/telnetd/Makefile.am +++ b/cpukit/telnetd/Makefile.am @@ -8,7 +8,6 @@ $(PROJECT_LIB)/libtelnetd.a: libtelnetd.a TMPINSTALL_FILES = $(PROJECT_LIB)/libtelnetd.a libtelnetd_a_SOURCES = check_passwd.c des.c pty.c telnetd.c telnetd-init.c -libtelnetd_a_CPPFLAGS = $(AM_CPPFLAGS) endif include $(top_srcdir)/automake/local.am -- cgit v1.2.3