[Expat-checkins] expat Makefile.in,1.54,1.55

[Karl Waclawek]

Update of /cvsroot/expat/expat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19502

Modified Files:
	Makefile.in 
Log Message:
Applied patch #1437840. Fix for bugs #1414066 and #1033965 .

Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/Makefile.in,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- Makefile.in	25 Jan 2006 23:04:46 -0000	1.54
+++ Makefile.in	6 Mar 2006 14:24:36 -0000	1.55
@@ -44,9 +44,7 @@
 APIHEADER = $(srcdir)/lib/expat.h $(srcdir)/lib/expat_external.h
 LIBRARY = libexpat.la
 
-ifndef INSTALL_ROOT
 INSTALL_ROOT=$(DESTDIR)
-endif
 
 default:  buildlib xmlwf/xmlwf
 
@@ -103,6 +101,7 @@
 	done
 
 CC = @CC@
+CXX = @CXX@
 LIBTOOL = @LIBTOOL@
 
 INCLUDES = -I$(srcdir)/lib -I.
@@ -158,10 +157,10 @@
 tests/minicheck.o: tests/minicheck.c tests/minicheck.h
 tests/runtests.o: tests/runtests.c tests/chardata.h
 tests/runtests: tests/runtests.o tests/chardata.o tests/minicheck.o $(LIBRARY)
-	$(LINK_EXE) $^
+	$(LINK_EXE) tests/runtests.o tests/chardata.o tests/minicheck.o $(LIBRARY)
 tests/runtestspp.o: tests/runtestspp.cpp tests/runtests.c tests/chardata.h
 tests/runtestspp: tests/runtestspp.o tests/chardata.o tests/minicheck.o $(LIBRARY)
-	$(LINK_CXX_EXE) $^
+	$(LINK_CXX_EXE) tests/runtestspp.o tests/chardata.o tests/minicheck.o $(LIBRARY)
 
 tests/xmlts.zip:
 	wget --output-document=tests/xmlts.zip \
@@ -173,7 +172,7 @@
 run-xmltest: xmlwf/xmlwf tests/XML-Test-Suite
 	tests/xmltest.sh
 
-.SUFFIXES: .c .lo .o
+.SUFFIXES: .c .cpp .lo .o
 
 .cpp.o:
 	$(CXXCOMPILE) -o $@ -c $<