--- Makefile.am~1	2006-03-04 14:20:29.000000000 +0200
+++ Makefile.am	2006-03-04 15:03:58.000000000 +0200
@@ -25,7 +25,11 @@
 include $(top_srcdir)/fragment.am
 
 # Cross compiler support.
+if DJGPP
+toolexeclib_LTLIBRARIES = libstdcxx.la
+else
 toolexeclib_LTLIBRARIES = libstdc++.la
+endif
 
 # Symbol versioning for shared libraries.
 # This could be conditional on
@@ -162,18 +166,35 @@
 	${host_sources} \
 	${host_sources_extra}
 
-VPATH = $(top_srcdir)/src:$(top_srcdir)
+VPATH = $(top_srcdir)/src $(top_srcdir)
 
+if DJGPP
+libstdcxx_la_SOURCES = $(sources)
+else
 libstdc___la_SOURCES = $(sources)
-
+endif
+  
+if DJGPP
+libstdcxx_la_LIBADD = \
+	$(top_builddir)/libmath/libmath.la \
+	$(top_builddir)/libsupc++/libsupc++convenience.la
+else
 libstdc___la_LIBADD = \
 	$(top_builddir)/libmath/libmath.la \
 	$(top_builddir)/libsupc++/libsupc++convenience.la
+endif
 
+if DJGPP
+libstdcxx_la_DEPENDENCIES = ${version_dep} $(libstdcxx_la_LIBADD)
+  
+libstdcxx_la_LDFLAGS = \
+	-version-info $(libtool_VERSION) ${version_arg} -lm
+else
 libstdc___la_DEPENDENCIES = ${version_dep} $(libstdc___la_LIBADD)
 
 libstdc___la_LDFLAGS = \
 	-version-info $(libtool_VERSION) ${version_arg} -lm 
+endif
 
 # Use special rules for the deprecated source files so that they find
 # deprecated include files.