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

5 files changed, 17 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 3f56989f..032b86d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@ Each utility has its own version number, date of last change and
 some description at the top of its ".c" file. All utilities in the main
 directory have their own "man" pages. There is also a sg3_utils man page.
 
-Changelog for sg3_utils-1.43 [20171009] [svn: r719]
+Changelog for sg3_utils-1.43 [20171009] [svn: r720]
   - sg_bg_ctl: new Background control command (sbc4r08)
   - sg_write_atomic: new 16 and 32 byte cdbs (sbc4r04)
     - also can issue plain WRITE(16 or 32)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1dd6b5ef..84202dc5 100644
--- a/lib/Makefile.am
+++ b/lib/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
+AM_CFLAGS = -Wall -W
 # AM_CFLAGS = -Wall -W -pedantic -std=c11
 # AM_CFLAGS = -Wall -W -pedantic -std=c11 --analyze
-AM_CFLAGS = -Wall -W -pedantic -std=c++14
+# AM_CFLAGS = -Wall -W -pedantic -std=c++14
 
 lib_LTLIBRARIES = libsgutils2.la
 
diff --git a/lib/Makefile.in b/lib/Makefile.in
index f045695e..fa695ceb 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -230,9 +230,7 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-
-# For C++/clang testing
-CC = clang++
+CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
@@ -349,12 +347,15 @@ libsgutils2_la_SOURCES = sg_lib.c sg_lib_data.c sg_cmds_basic.c \
 	$(am__append_1) $(am__append_2) $(am__append_3) \
 	$(am__append_4) $(am__append_5) $(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
 # AM_CFLAGS = -Wall -W -pedantic -std=c11
 # AM_CFLAGS = -Wall -W -pedantic -std=c11 --analyze
-AM_CFLAGS = -Wall -W -pedantic -std=c++14
+# AM_CFLAGS = -Wall -W -pedantic -std=c++14
 lib_LTLIBRARIES = libsgutils2.la
 libsgutils2_la_LDFLAGS = -version-info 2:0:0 -no-undefined
 libsgutils2_la_LIBADD = @GETOPT_O_FILES@ @os_libs@
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@