--- genometester-4.0+git20200511.91cecb5+dfsg.orig/src/Makefile
+++ genometester-4.0+git20200511.91cecb5+dfsg/src/Makefile
@@ -1,7 +1,7 @@
 # Project: GenomeTester v4.0
 
 VERSION = 4.0
-CXX  = gcc
+CC  = gcc
 
 # C Files
 
@@ -127,42 +127,42 @@
 INCS = -I.
 BINS  = glistmaker glistquery glistcompare
 
-#CXXFLAGS = $(INCS) $(DEBUGFLAGS) -Wall 
-CXXFLAGS += $(INCS) $(RELEASEFLAGS) -Wall $(LDFLAGS)
+#CFLAGS = $(INCS) $(DEBUGFLAGS) -Wall 
+CFLAGS += $(INCS) $(RELEASEFLAGS) -Wall $(LDFLAGS)
 
 .PHONY: all all-before all-after clean clean-custom
 
 all: all-before $(BINS) all-after
 
 glistmaker: $(LISTMAKER_SOURCES)
-	$(CXX) $(LISTMAKER_SOURCES) -o glistmaker $(LIBS) $(CXXFLAGS)
+	$(CC) $(LISTMAKER_SOURCES) -o glistmaker $(LIBS) $(CFLAGS)
 
 glistmaker2: $(LISTMAKER2_SOURCES)
-	$(CXX) $(LISTMAKER2_SOURCES) -o glistmaker2 $(LIBS) $(DEBUGFLAGS) -Wall
+	$(CC) $(LISTMAKER2_SOURCES) -o glistmaker2 $(LIBS) $(DEBUGFLAGS) -Wall
 
 glistquery: $(LISTQUERY_SOURCES)
-	$(CXX) $(LISTQUERY_SOURCES) -o glistquery $(LIBS) $(CXXFLAGS)
+	$(CC) $(LISTQUERY_SOURCES) -o glistquery $(LIBS) $(CFLAGS)
 
 glistcompare: $(LISTCOMPARE_SOURCES)
-	$(CXX) $(LISTCOMPARE_SOURCES) -o glistcompare $(LIBS) $(CXXFLAGS)
+	$(CC) $(LISTCOMPARE_SOURCES) -o glistcompare $(LIBS) $(CFLAGS)
 
 gdistribution: $(GDISTRIBUTION_SOURCES)
-	$(CXX) $(GDISTRIBUTION_SOURCES) -o gdistribution $(LIBS) $(CXXFLAGS)
+	$(CC) $(GDISTRIBUTION_SOURCES) -o gdistribution $(LIBS) $(CFLAGS)
 
 gmer_counter: $(GMER_COUNTER_SOURCES)
-	$(CXX) $(GMER_COUNTER_SOURCES) -o gmer_counter $(LIBS) $(CXXFLAGS) -Wall
+	$(CC) $(GMER_COUNTER_SOURCES) -o gmer_counter $(LIBS) $(CFLAGS) -Wall
 
 gmer_caller: $(GMER_CALLER_SOURCES)
-	$(CXX) $(GMER_CALLER_SOURCES) -o gmer_caller $(LIBS) $(CXXFLAGS) -Wall
+	$(CC) $(GMER_CALLER_SOURCES) -o gmer_caller $(LIBS) $(CFLAGS) -Wall
 
 gassembler: $(GASSEMBLER_SOURCES)
-	$(CXX) $(GASSEMBLER_SOURCES) -o gassembler $(LIBS) $(CXXFLAGS) -Wall
+	$(CC) $(GASSEMBLER_SOURCES) -o gassembler $(LIBS) $(CFLAGS) -Wall
 
 distro: $(DISTRO_SOURCES)
-	$(CXX) $(DISTRO_SOURCES) -o distro $(LIBS) $(CXXFLAGS) -Wall
+	$(CC) $(DISTRO_SOURCES) -o distro $(LIBS) $(CFLAGS) -Wall
 
 aleq: $(ALEQ_SOURCES)
-	$(CXX) $(ALEQ_SOURCES) -o aleq $(LIBS) $(CXXFLAGS) -Wall
+	$(CC) $(ALEQ_SOURCES) -o aleq $(LIBS) $(CFLAGS) -Wall
 	
 clean: clean-custom
 	rm -f *.o $(BINS)
--- genometester-4.0+git20200511.91cecb5+dfsg.orig/src/Makefile.gmer
+++ genometester-4.0+git20200511.91cecb5+dfsg/src/Makefile.gmer
@@ -1,7 +1,7 @@
 # Project: GMER Caller
 
 VERSION = 1.0
-CXX  = gcc
+CC  = gcc
 
 # C Files
 
@@ -37,18 +37,18 @@
 INCS = -I.
 BINS  = gmer_counter gmer_caller
 
-#CXXFLAGS = $(INCS) $(DEBUGFLAGS) -Wall 
-CXXFLAGS = $(INCS) $(RELEASEFLAGS) -Wall 
+#XFLAGS = $(INCS) $(DEBUGFLAGS) -Wall 
+CFLAGS = $(INCS) $(RELEASEFLAGS) -Wall 
 
 .PHONY: all all-before all-after clean clean-custom
 
 all: all-before $(BINS) all-after
 
 gmer_counter: $(GMERCOUNTER_SOURCES)
-	$(CXX) $(GMERCOUNTER_SOURCES) -o gmer_counter $(LIBS) $(CXXFLAGS) -Wall
+	$(CC) $(GMERCOUNTER_SOURCES) -o gmer_counter $(LIBS) $(CFLAGS) -Wall
 
 gmer_caller: $(GMER_CALLER_SOURCES)
-	$(CXX) $(GMER_CALLER_SOURCES) -o gmer_caller $(LIBS) $(CXXFLAGS) -Wall
+	$(CC) $(GMER_CALLER_SOURCES) -o gmer_caller $(LIBS) $(CFLAGS) -Wall
 
 dist: $(GMERCOUNTER_SOURCES) $(GMER_CALLER_SOURCES)
 	mkdir fastgt_$(VERSION);