diff -uN util/Makefile util.new/Makefile
--- util/Makefile	2015-12-03 19:56:28.689770871 +0100
+++ util.new/Makefile	2015-12-03 20:03:54.439977807 +0100
@@ -156,7 +156,7 @@
 DEP_OBJ += $(addsuffix .o,$(PROGS))
 
 an-pnmtofits: an-pnmtofits.o $(ANFILES_SLIB)
-	$(CC) -o $@ $(LDFLAGS) $^ $(NETPBM_LIB) $(LDLIBS)
+	$(CC) $(LDFLAGS) $^ $(NETPBM_LIB) $(LDLIBS) -o $@
 ALL_OBJ += an-pnmtofits.o
 
 wcs-pv2sip: wcs-pv2sip.o $(ANUTILS_SLIB)
@@ -253,32 +253,32 @@
 	@echo
 	@echo "Testing canonicalize_file_name..."
 	@echo "Testing canonicalize_file_name..." >> os-features.log
-	(($(CC) -o os-features-test-canonicalize \
-	  $(CPPFLAGS) $(CFLAGS) -DTEST_CANONICALIZE_FILE_NAME $^ $(LDFLAGS) >> os-features.log && \
+	(($(CC) $(LDFLAGS) \
+	  $(CFLAGS) -DTEST_CANONICALIZE_FILE_NAME $^ -o os-features-test-canonicalize >> os-features.log && \
 	  ./os-features-test-canonicalize >> os-features.log && \
 	  echo "#define NEED_CANONICALIZE_FILE_NAME 0") \
 	|| echo "#define NEED_CANONICALIZE_FILE_NAME 1") >> $@.tmp
 	@echo
 	@echo "Testing declare qsort_r..."
 	@echo "Testing declare qsort_r..." >> os-features.log
-	(($(CC) -o os-features-test-declare-qsort \
-	   $(CPPFLAGS) $(CFLAGS) -DTEST_DECLARE_QSORT_R $^ $(LDFLAGS) >> os-features.log && \
+	(($(CC) $(LDFLAGS) \
+	   $(CFLAGS) -DTEST_DECLARE_QSORT_R $^ -o os-features-test-declare-qsort >> os-features.log && \
 	   ./os-features-test-declare-qsort >> os-features.log && \
 	   echo "#define NEED_DECLARE_QSORT_R 1") \
 	|| echo "#define NEED_DECLARE_QSORT_R 0") >> $@.tmp
 	@echo
 	@echo "Testing qsort_r..."
 	@echo "Testing qsort_r..." >> os-features.log
-	(($(CC) -o os-features-test-qsort \
-	   $(CPPFLAGS) $(CFLAGS) -DTEST_QSORT_R $^ $(LDFLAGS) >> os-features.log && \
+	(($(CC) $(LDFLAGS) \
+	   $(CFLAGS) -DTEST_QSORT_R $^ -o os-features-test-qsort >> os-features.log && \
 	   ./os-features-test-qsort >> os-features.log && \
 	   echo "#define NEED_QSORT_R 0") \
 	|| echo "#define NEED_QSORT_R 1") >> $@.tmp
 	@echo
 	@echo "Testing swap qsort_r..."
 	@echo "Testing swap qsort_r..." >> os-features.log
-	(($(CC) -Werror -o os-features-test-swap-qsort \
-	   $(CPPFLAGS) $(CFLAGS) -DTEST_SWAP_QSORT_R $^ $(LDFLAGS) >> os-features.log && \
+	(($(CC) $(LDFLAGS) -Werror  \
+	   $(CFLAGS) -DTEST_SWAP_QSORT_R $^ -o os-features-test-swap-qsort >> os-features.log && \
 	   ./os-features-test-swap-qsort >> os-features.log && \
 	   echo "#define NEED_SWAP_QSORT_R 0") \
 	|| echo "#define NEED_SWAP_QSORT_R 1") >> $@.tmp
@@ -287,8 +287,8 @@
 	@echo "   NETPBM_INC is $(NETPBM_INC_ORIG)"
 	@echo "   NETPBM_LIB is $(NETPBM_LIB_ORIG)"
 	@echo "Testing netpbm..." >> os-features.log
-	(($(CC) -o os-features-test-netpbm \
-	   $(CPPFLAGS) $(CFLAGS) -DTEST_NETPBM $(NETPBM_INC_ORIG) $^ $(LDFLAGS) $(NETPBM_LIB_ORIG) >> os-features.log && \
+	(($(CC) $(LDFLAGS) \
+	   $(CFLAGS) -DTEST_NETPBM $(NETPBM_INC_ORIG) $^ -o os-features-test-netpbm $(NETPBM_LIB_ORIG) >> os-features.log && \
 	   ./os-features-test-netpbm >> os-features.log && \
 	   echo "#define HAVE_NETPBM 1") \
 	|| echo "#define HAVE_NETPBM 0") >> $@.tmp
@@ -314,8 +314,8 @@
 	@echo "   NETPBM_LIB_ORIG is $(NETPBM_LIB_ORIG)"
 	( \
 	 echo "# This file is generated by util/Makefile."; \
-	 (($(CC) -o os-features-test-netpbm-make \
-	   $(CPPFLAGS) $(CFLAGS) -DTEST_NETPBM_MAKE $(NETPBM_INC_ORIG) $^ $(LDFLAGS) $(NETPBM_LIB_ORIG) >> os-features-makefile.log && \
+	(($(CC) $(LDFLAGS) \
+	   $(CFLAGS) -DTEST_NETPBM_MAKE $(NETPBM_INC_ORIG) $^ -o os-features-test-netpbm-make $(NETPBM_LIB_ORIG) >> os-features-makefile.log && \
 	   ./os-features-test-netpbm-make >> os-features-makefile.log && \
 	   echo "HAVE_NETPBM := yes") \
 	|| (echo "# Astrometry.net didn't find netpbm; not setting HAVE_NETPBM."; \
diff -uN util/makefile.tests util.new/makefile.tests
--- util/makefile.tests	2015-12-03 19:56:28.689770871 +0100
+++ util.new/makefile.tests	2015-12-03 20:04:49.151881458 +0100
@@ -37,7 +37,7 @@
 	$(AN_SHELL) $(MAKE_TESTS) $(TEST_SOURCES) > $@
 
 test: test.o $(COMMON)/cutest.o $(ALL_TEST_FILES_O) $(sort $(ALL_TEST_EXTRA_OBJS)) $(ALL_TEST_LIBS)
-	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(ALL_TEST_EXTRA_LDFLAGS) $(LDLIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(ALL_TEST_EXTRA_LDFLAGS) $(LDLIBS) -o $@
 
 $(ALL_TEST_FILES_O) $(ALL_TEST_FILES_MAIN_O) test.o: %.o: %.c
 	$(CC) -o $@ $(CPPFLAGS) $(CFLAGS) -c $< -I$(COMMON)