diff options
author | Douglas Gilbert <dgilbert@interlog.com> | 2017-10-10 00:46:34 +0000 |
---|---|---|
committer | Douglas Gilbert <dgilbert@interlog.com> | 2017-10-10 00:46:34 +0000 |
commit | 2715125260da177d9869321027ef22a9f49fde1b (patch) | |
tree | 8825f082ae11e3d47d77db45fd6baa0d4db471c2 /src | |
parent | b2e59f46a39f19ffc18be02fad71df68974a8d0b (diff) | |
download | sg3_utils-2715125260da177d9869321027ef22a9f49fde1b.tar.gz |
switch Makefile.am from clang++ but to normal C (gcc)
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@720 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 6 | ||||
-rw-r--r-- | src/Makefile.in | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index f557df05..1012a78d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -37,15 +37,15 @@ endif ## CC = gcc ## CC = g++ ## CC = clang -CC = clang++ +## CC = clang++ # -std=<s> can be c99, c11, gnu11, etc. Default is gnu89 (gnu90 is the same) # -Wall is no longer all warnings. Add -W (since renamed to -Wextra) for more AM_CPPFLAGS = -iquote ${top_srcdir}/include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -##AM_CFLAGS = -Wall -W @os_cflags@ +AM_CFLAGS = -Wall -W @os_cflags@ # AM_CFLAGS = -Wall -W @os_cflags@ -pedantic -std=c11 # AM_CFLAGS = -Wall -W @os_cflags@ -pedantic -std=c11 --analyze -AM_CFLAGS = -Wall -W @os_cflags@ -pedantic -std=c++14 +# AM_CFLAGS = -Wall -W @os_cflags@ -pedantic -std=c++14 sg_bg_ctl_LDADD = ../lib/libsgutils2.la @os_libs@ diff --git a/src/Makefile.in b/src/Makefile.in index 1da3f58a..fcfe1332 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -450,9 +450,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ - -# For C++/clang testing -CC = clang++ +CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ @@ -566,12 +564,15 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ sg_scan_SOURCES = $(am__append_2) $(am__append_4) $(am__append_6) +# For C++/clang testing + # -std=<s> can be c99, c11, gnu11, etc. Default is gnu89 (gnu90 is the same) # -Wall is no longer all warnings. Add -W (since renamed to -Wextra) for more AM_CPPFLAGS = -iquote ${top_srcdir}/include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +AM_CFLAGS = -Wall -W @os_cflags@ # AM_CFLAGS = -Wall -W @os_cflags@ -pedantic -std=c11 # AM_CFLAGS = -Wall -W @os_cflags@ -pedantic -std=c11 --analyze -AM_CFLAGS = -Wall -W @os_cflags@ -pedantic -std=c++14 +# AM_CFLAGS = -Wall -W @os_cflags@ -pedantic -std=c++14 sg_bg_ctl_LDADD = ../lib/libsgutils2.la @os_libs@ sg_compare_and_write_LDADD = ../lib/libsgutils2.la @os_libs@ sg_copy_results_LDADD = ../lib/libsgutils2.la @os_libs@ |