Makefile: Minor shuffle

Drop the redundant CFLAGSX variable.

Move @DEPFLAGS@ later, after filename and other options. I use to pipe
make's output through a truncating tool of sorts, and the other options
are more useful to have kept in that output.

Author: magnumripper

src/Makefile.in

@@ -60,10 +60,9 @@ JTR_GIT_VERSION = JUMBO_VERSION \"-stabilized\"
 endif
 
 CPPFLAGS = @CPPFLAGS@
-CFLAGSX = -c @CFLAGS@ @JOHN_NO_SIMD@ @CFLAGS_EXTRA@ @OPENSSL_CFLAGS@ @OPENMP_CFLAGS@ @HAVE_MPI@ @PTHREAD_CFLAGS@ $(CPPFLAGS)
 # CFLAGS for use on the main john.c file only
-CFLAGS_MAIN = @DEPFLAGS@ -DAC_BUILT @CC_MAIN_CPU@ $(CFLAGSX)
-CFLAGS = @DEPFLAGS@ -DAC_BUILT @CC_CPU@ @CC_MAIN_CPU@ $(CFLAGSX)
+CFLAGS_MAIN = @CC_MAIN_CPU@ -c @CFLAGS@ -DAC_BUILT @JOHN_NO_SIMD@ @CFLAGS_EXTRA@ @OPENSSL_CFLAGS@ @OPENMP_CFLAGS@ @HAVE_MPI@ @PTHREAD_CFLAGS@ @DEPFLAGS@ $(CPPFLAGS)
+CFLAGS = @CC_CPU@ $(CFLAGS_MAIN)
 ASFLAGS = -DAC_BUILT @ASFLAGS@ @JOHN_NO_SIMD@ @CC_CPU@ @CC_MAIN_CPU@ -c @OPENMP_CFLAGS@ @HAVE_MPI@ @EXTRA_AS_FLAGS@
 LIBS = @LIBS@
 LDFLAGS = -g @LDFLAGS@ $(LIBS) @HAVE_MPI@
@@ -398,10 +397,10 @@ poly1305-donna/poly1305-donna.a:
 	$(LD) SIPdump.o $(LDFLAGS) @PCAP_LIBS@ @OPENMP_CFLAGS@ -o $@
 
 ../run/vncpcap2john@EXE_EXT@: vncpcap2john.o
-	$(CC) @DEPFLAGS@ -DAC_BUILT -Wall vncpcap2john.o $(LDFLAGS) @PCAP_LIBS@ @OPENMP_CFLAGS@ -o $@
+	$(CC) -Wall vncpcap2john.o -DAC_BUILT $(LDFLAGS) @PCAP_LIBS@ @OPENMP_CFLAGS@ @DEPFLAGS@ -o $@
 
 ../run/eapmd5tojohn@EXE_EXT@: eapmd5tojohn.o
-	$(CC) @DEPFLAGS@ -DAC_BUILT -Wall eapmd5tojohn.o $(LDFLAGS) @PCAP_LIBS@ @OPENMP_CFLAGS@ -o $@
+	$(CC) -Wall eapmd5tojohn.o -DAC_BUILT $(LDFLAGS) @PCAP_LIBS@ @OPENMP_CFLAGS@ @DEPFLAGS@ -o $@
 
 ../run/uaf2john@EXE_EXT@: uaf2john.o uaf_encode.o
 	$(LD) $(LDFLAGS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ uaf2john.o uaf_encode.o @OPENMP_CFLAGS@ -o $@