--- src/Makefile.in.orig	Wed Sep 14 22:08:24 2005
+++ src/Makefile.in	Sun Jul  8 00:11:14 2007
@@ -249,7 +249,7 @@ normalize_DEPENDENCIES = $(top_builddir)/nid3lib/libni
 normalize_CFLAGS = @AUDIOFILE_CFLAGS@ $(AM_CFLAGS)
 localedir = $(datadir)/locale
 INCLUDES = -I$(top_srcdir)/nid3lib \
-	-I$(top_builddir)/intl -DLOCALEDIR=\"$(localedir)\"
+	-DLOCALEDIR=\"$(localedir)\"
 
 EXTRA_DIST = normalize-mp3.in mktestwav.c
 CLEANFILES = mktestwav riffwalk wavread test-wiener-af test-real-af mp3adjust
@@ -712,31 +712,31 @@ install-exec-hook:
 # test program targets follow
 
 mktestwav: mktestwav.o riff.o version.o getopt.o getopt1.o
-	$(LINK) $^ -lm
+	$(LINK) mktestwav.o riff.o version.o getopt.o getopt1.o -lm
 
 mktestwav.o: mktestwav.c riff.h
 
 riffwalk: riffwalk.o
 
 riffwalk.o: riff.c
-	$(COMPILE) -DBUILD_RIFFWALK -c -o $@ $^
+	$(COMPILE) -DBUILD_RIFFWALK -c -o $@ riff.c
 
 wavread: wavread.o
 
 wavread.o: riff.c
-	$(COMPILE) -DBUILD_WAVREAD -c -o $@ $^
+	$(COMPILE) -DBUILD_WAVREAD -c -o $@ riff.c
 
 test-wiener-af: test-wiener-af.o wav.o riff.o version.o
-	$(LINK) $^ -lm
+	$(LINK) test-wiener-af.o wav.o riff.o version.o -lm
 
 test-wiener-af.o: testaf.c
-	$(COMPILE) -DFORCE_NOAUDIOFILE -c -o $@ $^
+	$(COMPILE) -DFORCE_NOAUDIOFILE -c -o $@ testaf.c
 
 test-real-af: test-real-af.o
-	$(LINK) $^ -L/usr/local/lib -lm -laudiofile
+	$(LINK) test-real-af.o -L/usr/local/lib -lm -laudiofile
 
 test-real-af.o: testaf.c
-	$(COMPILE) -DFORCE_AUDIOFILE -c -o $@ $^
+	$(COMPILE) -DFORCE_AUDIOFILE -c -o $@ testaf.c
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
