--- Makefile.orig	2005-10-18 00:41:01 UTC
+++ Makefile
@@ -10,13 +10,11 @@
 # debugging
 # DFLAGS = -DTEST -DDEBUG
 DFLAGS = -DGAPING_SECURITY_HOLE
-CFLAGS = -O
 XFLAGS = 	# xtra cflags, set by systype targets
 XLIBS =		# xtra libs if necessary?
 # -Bstatic for sunos,  -static for gcc, etc.  You want this, trust me.
 STATIC =
-CC = cc $(CFLAGS)
-LD = $(CC) -s	# linker; defaults to stripped executables
+LD = $(CXX) -s	# linker; defaults to stripped executables
 o = o		# object extension
 
 ALL = cryptcat
@@ -28,8 +26,11 @@ bogus:
 
 ### HARD TARGETS
 
-cryptcat:	netcat.c farm9crypt.o twofish2.o
-	$(LD) $(DFLAGS) $(XFLAGS) $(STATIC) -o cryptcat netcat.c farm9crypt.o twofish2.o $(XLIBS)
+netcat.o:
+	$(CC) $(CFLAGS) -c netcat.c
+
+cryptcat:      netcat.o farm9crypt.o twofish2.o
+	$(LD) $(CFLAGS) $(DFLAGS) $(XFLAGS) $(STATIC) -o cryptcat netcat.o farm9crypt.o twofish2.o $(XLIBS)
 
 nc-dos:
 	@echo "DOS?!  Maybe someday, but not now"
@@ -115,10 +116,10 @@ next:
 	make -e $(ALL) $(MFLAGS) XFLAGS='-DNEXT' STATIC=-Bstatic
 
 farm9crypt.o: farm9crypt.cc farm9crypt.h
-		${CC} -c farm9crypt.cc
+		${CC} ${CFLAGS} -c farm9crypt.cc
 
 twofish2.o: twofish2.cc twofish2.h
-		${CC} -c twofish2.cc
+		${CC} ${CFLAGS} -c twofish2.cc
 
 # start with this for a new architecture, and see what breaks.
 generic: