libnoise-libtool-tags.diff

Index: libnoise/noise/src/Makefile
===================================================================
--- libnoise.orig/noise/src/Makefile
+++ libnoise/noise/src/Makefile
@@ -15,7 +15,7 @@ libnoise: libnoise.la
 
 # Real build targets
 libnoise.la: $(OBJECTS)
-	$(LIBTOOL) --mode=link $(CXX) -static $(LDFLAGS) -o $@ $(OBJECTS:.o=.lo)
+	$(LIBTOOL) --tag=CXX --mode=link $(CXX) -static $(LDFLAGS) -o $@ $(OBJECTS:.o=.lo)
 
 clean:	cleandeps cleanobjs cleanlib
 cleandeps:
@@ -39,10 +39,10 @@ cleanlib:
 
 # C and C++ libtool (rather than raw CXX/CC) use
 %.lo: %.cpp
-	$(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
+	( cd $(dir $<) ; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(notdir $<) -o $(notdir $@) )
 
 %.lo: %.c
-	$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
+	( cd $(dir $<) ; $(LIBTOOL) --tag=CC --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c $(notdir $<) -o $(notdir $@) )
 
 # If dependancies have never been built this will produce a horde of
 # "file not found" warnings and *then* build the deps.  Very odd.