Still more edits to support Clang compilation

JPEG/Makefile

@@ -1,8 +1,8 @@
 JPG_TARGET=libmyjpg.a
 JPG_SOURCE=ckconfig.cpp jccolor.cpp jcmainct.cpp jcparam.cpp jctrans.cpp jdatasrc.cpp jdhuff.cpp jdmaster.cpp jdsample.cpp jfdctfst.cpp jidctint.cpp jquant1.cpp jcapimin.cpp jcdctmgr.cpp jcmarker.cpp jcphuff.cpp jdapimin.cpp jdcoefct.cpp jdinput.cpp jdmerge.cpp jdtrans.cpp jfdctint.cpp jidctred.cpp jquant2.cpp jcapistd.cpp jchuff.cpp jcmaster.cpp jcprepct.cpp jdapistd.cpp jdcolor.cpp jdmainct.cpp jdphuff.cpp jerror.cpp jidctflt.cpp jmemmgr.cpp jutils.cpp jccoefct.cpp jcinit.cpp jcomapi.cpp jcsample.cpp jdatadst.cpp jddctmgr.cpp jdmarker.cpp jdpostct.cpp jfdctflt.cpp jidctfst.cpp jmemnobs.cpp 
 
-COMPILER = gcc
-#COMPILER = clang
+COMPILER ?= gcc
+#COMPILER ?= clang
 
 CFLAGS += -Wno-deprecated -Wno-write-strings
 
@@ -20,10 +20,8 @@ ifeq ($(COMPILER),gcc)
 	CC=gcc
 	CXX=g++
 else
-	CC=clang-3.8
-	CXX=clang++-3.8
-#	CC=clang-3.5
-#	CXX=clang++-3.5
+	CC=clang
+	CXX=clang++
 endif
 
 MD=mkdir

Makefile

@@ -48,8 +48,6 @@ ifeq ($(COMPILER),gcc)
 else
 	CC=clang
 	CXX=clang++
-#	CC=clang
-#	CXX=clang++
 endif
 
 MD=mkdir
@@ -152,15 +150,15 @@ make_dir:
 	$(MD) -p $(BIN)
 
 $(BIN)$(PR_TARGET): $(PR_OBJECTS)
-	cd PNG  && make
+	cd PNG  && make COMPILER=$(COMPILER)
 	$(CXX) -pthread -o $@ $(PR_OBJECTS) -L$(BIN) $(LFLAGS) -ljpeg -lmypng -lz
 
 $(BIN)$(SR_TARGET): $(SR_OBJECTS)
-	cd PNG  && make
+	cd PNG  && make COMPILER=$(COMPILER)
 	$(CXX) -pthread -o $@ $(SR_OBJECTS) -L$(BIN) $(LFLAGS) -ljpeg -lmypng -lz
 
 $(BIN)$(PI_TARGET): $(PI_OBJECTS)
-	cd PNG  && make
+	cd PNG  && make COMPILER=$(COMPILER)
 	$(CXX) -pthread -o $@ $(PI_OBJECTS) -L$(BIN) $(LFLAGS) -ljpeg -lmypng -lz
 
 $(BIN)$(ST_TARGET): $(ST_OBJECTS)
@@ -170,15 +168,15 @@ $(BIN)$(EH_TARGET): $(EH_OBJECTS)
 	$(CXX) -pthread -o $@ $(EH_OBJECTS) $(LFLAGS)
 
 $(BIN)$(IS_TARGET): $(IS_OBJECTS)
-	cd PNG  && make
+	cd PNG  && make COMPILER=$(COMPILER)
 	$(CXX) -pthread -o $@ $(IS_OBJECTS) -L$(BIN) $(LFLAGS) -ljpeg -lmypng -lz
 
 $(BIN)$(AV_TARGET): $(AV_OBJECTS)
-	cd PNG  && make
+	cd PNG  && make COMPILER=$(COMPILER)
 	$(CXX) -pthread -o $@ $(AV_OBJECTS) -L$(BIN) $(LFLAGS) -ljpeg -lmypng -lz
 
 $(BIN)$(CP_TARGET): $(CP_OBJECTS)
-	cd PNG  && make
+	cd PNG  && make COMPILER=$(COMPILER)
 	$(CXX) -pthread -o $@ $(CP_OBJECTS) -L$(BIN) $(LFLAGS) -ljpeg -lmypng -lz
 
 $(BIN)%.o: $(SRC)%.c

PNG/Makefile

@@ -1,8 +1,8 @@
 PNG_TARGET=libmypng.a
 PNG_SOURCE=png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c pngread.c pngrio.c pngrtran.c pngrutil.c pngset.c pngtest.c pngtrans.c pngvcrd.c pngwio.c pngwrite.c pngwtran.c pngwutil.c
 
-COMPILER = gcc
-#COMPILER = clang
+COMPILER ?= gcc
+#COMPILER ?= clang
 
 CFLAGS += -Wno-deprecated -Wno-write-strings
 
@@ -20,10 +20,8 @@ ifeq ($(COMPILER),gcc)
 	CC=gcc
 	CXX=g++
 else
-	CC=clang-3.8
-	CXX=clang++-3.8
-#	CC=clang-3.5
-#	CXX=clang++-3.5
+	CC=clang
+	CXX=clang++
 endif
 
 MD=mkdir

ZLIB/Makefile

@@ -1,8 +1,8 @@
 ZLIB_TARGET=libmyz.a
 ZLIB_SOURCE=adler32.c compress.c crc32.c deflate.c gzio.c infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c trees.c uncompr.c zutil.c
 
-COMPILER = gcc
-#COMPILER = clang
+COMPILER ?= gcc
+#COMPILER ?= clang
 
 CFLAGS += -Wno-deprecated -Wno-write-strings
 
@@ -20,10 +20,8 @@ ifeq ($(COMPILER),gcc)
 	CC=gcc
 	CXX=g++
 else
-	CC=clang-3.8
-	CXX=clang++-3.8
-#	CC=clang-3.5
-#	CXX=clang++-3.5
+	CC=clang
+	CXX=clang++
 endif
 
 MD=mkdir