--- gsoap-2.7.9l.orig/soapcpp2/samples/polytest/Makefile
+++ gsoap-2.7.9l/soapcpp2/samples/polytest/Makefile
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # soapcpp2/samples/polytest/Makefile.  Generated from Makefile.in by configure.
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,237 +13,173 @@
 # PARTICULAR PURPOSE.
 
 
-
-SOURCES = $(polytest_cgi_SOURCES)
+SHELL = /bin/sh
 
 srcdir = .
 top_srcdir = ../../..
 
+prefix = /usr
+exec_prefix = ${prefix}
+
+bindir = ${exec_prefix}/bin
+sbindir = ${exec_prefix}/sbin
+libexecdir = ${exec_prefix}/libexec
+datadir = ${prefix}/share
+sysconfdir = ${prefix}/etc
+sharedstatedir = ${prefix}/com
+localstatedir = ${prefix}/var
+libdir = ${exec_prefix}/lib
+infodir = ${prefix}/share/info
+mandir = ${prefix}/share/man
+includedir = ${prefix}/include
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/soapcpp2
 pkglibdir = $(libdir)/soapcpp2
 pkgincludedir = $(includedir)/soapcpp2
 top_builddir = ../../..
+
+ACLOCAL = ${SHELL} /home/moeller/debian/gsoap/gsoap-2.7.9l/missing --run aclocal-1.6
+AUTOCONF = ${SHELL} /home/moeller/debian/gsoap/gsoap-2.7.9l/missing --run autoconf
+AUTOMAKE = ${SHELL} /home/moeller/debian/gsoap/gsoap-2.7.9l/missing --run automake-1.6
+AUTOHEADER = ${SHELL} /home/moeller/debian/gsoap/gsoap-2.7.9l/missing --run autoheader
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = /usr/bin/install -c
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DATA = ${INSTALL} -m 644
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = ${INSTALL}
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = s,x,x,
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = i686-intel-linux
-host_triplet = i686-intel-linux
-noinst_PROGRAMS = polytest.cgi$(EXEEXT)
-DIST_COMMON = $(srcdir)/../Makefile.cpp_rules \
-	$(srcdir)/../Makefile.defines $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-subdir = soapcpp2/samples/polytest
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-PROGRAMS = $(noinst_PROGRAMS)
-am__objects_1 =
-am__objects_2 = soapClient.$(OBJEXT) soapC.$(OBJEXT)
-am_polytest_cgi_OBJECTS = polymorph.$(OBJEXT) $(am__objects_1) \
-	$(am__objects_2) soapServer.$(OBJEXT)
-polytest_cgi_OBJECTS = $(am_polytest_cgi_OBJECTS)
-polytest_cgi_LDADD = $(LDADD)
-am__DEPENDENCIES_1 = $(top_builddir)/soapcpp2/libgsoap++.a
-am__DEPENDENCIES_2 =
-polytest_cgi_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_2)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-	-o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(polytest_cgi_SOURCES)
-DIST_SOURCES = $(polytest_cgi_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/faculty/engelen/Projects/gsoap/gsoap-2.7/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/faculty/engelen/Projects/gsoap/gsoap-2.7/missing --run tar
-AUTOCONF = ${SHELL} /home/faculty/engelen/Projects/gsoap/gsoap-2.7/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/faculty/engelen/Projects/gsoap/gsoap-2.7/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/faculty/engelen/Projects/gsoap/gsoap-2.7/missing --run automake-1.9
+host_alias = x86_64-linux-gnu
+host_triplet = x86_64-pc-linux-gnu
+
+EXEEXT = 
+OBJEXT = o
+PATH_SEPARATOR = :
+AMTAR = ${SHELL} /home/moeller/debian/gsoap/gsoap-2.7.9l/missing --run tar
 AWK = gawk
 BISON_DEFINE = -DWITH_BISON
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-CPP = gcc -E
-CPPFLAGS = 
-CXX = g++
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEBUG_COMPILE_FALSE = 
-DEBUG_COMPILE_TRUE = #
-DEFS = -DHAVE_CONFIG_H
+CC = x86_64-linux-gnu-gcc
+CPP = x86_64-linux-gnu-gcc -E
+CXX = x86_64-linux-gnu-g++
 DEPDIR = .deps
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = grep -E
 ENABLE_SAMPLES = 
-ENABLE_SAMPLES_FALSE = 
-ENABLE_SAMPLES_TRUE = #
-EXEEXT = 
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
 LEX = flex
 LEXLIB = -lfl
 LEX_DEFINE = -DWITH_FLEX
 LEX_FLAGS = -l
 LEX_OUTPUT_ROOT = lex.yy
-LIBOBJS = 
-LIBS = 
 LN_S = ln -s
-LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/faculty/engelen/Projects/gsoap/gsoap-2.7/missing --run makeinfo
-OBJEXT = o
 PACKAGE = soapcpp2
-PACKAGE_BUGREPORT = 
-PACKAGE_NAME = soapcpp2
-PACKAGE_STRING = soapcpp2 2.7
-PACKAGE_TARNAME = soapcpp2
-PACKAGE_VERSION = 2.7
-PATH_SEPARATOR = :
-POW_LIB = 
 RANLIB = ranlib
 SAMPLE_DIRS = 
 SAMPLE_EXTRA_LIBS = 
-SET_MAKE = 
-SHELL = /bin/sh
 SOAPCPP2_DEBUG = 
 SOAPCPP2_NONAMESPACES = 
 STRIP = 
 VERSION = 2.7
 YACC = bison -y
 YACC_LIB = 
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_RANLIB = ranlib
-ac_ct_STRIP = 
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE = 
 am__include = include
-am__leading_dot = .
 am__quote = 
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build = i686-intel-linux
-build_alias = 
-build_cpu = i686
-build_os = linux
-build_vendor = intel
-datadir = ${prefix}/share
-exec_prefix = ${prefix}
-host = i686-intel-linux
-host_alias = 
-host_cpu = i686
-host_os = linux
-host_vendor = intel
-includedir = ${prefix}/include
-infodir = ${prefix}/info
-install_sh = /home/faculty/engelen/Projects/gsoap/gsoap-2.7/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localstatedir = ${prefix}/var
-mandir = ${prefix}/man
-mkdir_p = mkdir -p --
-oldincludedir = /usr/include
+install_sh = /home/moeller/debian/gsoap/gsoap-2.7.9l/install-sh
 platform = LINUX
-prefix = /usr/local
-program_transform_name = s,x,x,
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-target_alias = 
 
 ####### This is the input file for automake, which will generate Makefile.in ##########
 AUTOMAKE_OPTIONS = foreign 1.4
+noinst_PROGRAMS = polytest.cgi
 SOAPHEADER = polymorph.h
+
 AM_CFLAGS = -D$(platform)
 AM_CXXFLAGS = -D$(platform)
 INCLUDES = -I$(top_srcdir)/soapcpp2
 SOAP = $(top_srcdir)/soapcpp2/src/soapcpp2
+
 SOAP_NS_DEF = ns.nsmap ns.wsdl
+
 SOAP_H_FILES = soapH.h soapStub.h 
+
 SOAP_FLAGS = -I$(top_srcdir)/soapcpp2/import
+
 SOAP_C_CLIENT = soapClient.c soapC.c
 SOAP_C_SERVER = soapServer.c soapC.c
 SOAP_C_LIB = $(top_builddir)/soapcpp2/libgsoap.a
 SOAP_C_LIB_CK = $(top_builddir)/soapcpp2/libgsoapck.a
+
 SOAP_CPP_CLIENT = soapClient.cpp soapC.cpp
 SOAP_CPP_SERVER = soapServer.cpp soapC.cpp
 SOAP_CPP_LIB = $(top_builddir)/soapcpp2/libgsoap++.a
 SOAP_CPP_LIB_CK = $(top_builddir)/soapcpp2/libgsoapck++.a
+
 SOAP_NS = polymorph.nsmap polymorph.wsdl
+
 SOAP_CPP_SRC = $(SOAP_CPP_CLIENT) soapServer.cpp $(SOAP_H_FILES) $(SOAP_NS)
+
 LDADD = $(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS)
 BUILT_SOURCES = $(SOAP_CPP_SRC) 
 CLEANFILES = $(SOAP_CPP_SRC) *.req.xml *.res.xml *.wsdl *.nsmap *.xsd soapStub.h soapH.h soapC.cpp soap*Proxy.h soap*Object.h soapClient.cpp soapServer.cpp soapClientLib.cpp soapServerLib.cpp *~
+
 polytest_cgi_SOURCES = polymorph.cpp $(SOAPHEADER) $(SOAP_CPP_CLIENT) soapServer.cpp
+subdir = soapcpp2/samples/polytest
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+noinst_PROGRAMS = polytest.cgi$(EXEEXT)
+PROGRAMS = $(noinst_PROGRAMS)
+
+am__objects_1 =
+am__objects_2 = soapClient.$(OBJEXT) soapC.$(OBJEXT)
+am_polytest_cgi_OBJECTS = polymorph.$(OBJEXT) $(am__objects_1) \
+	$(am__objects_2) soapServer.$(OBJEXT)
+polytest_cgi_OBJECTS = $(am_polytest_cgi_OBJECTS)
+polytest_cgi_LDADD = $(LDADD)
+polytest_cgi_DEPENDENCIES = $(top_builddir)/soapcpp2/libgsoap++.a
+polytest_cgi_LDFLAGS =
+
+DEFS = -DHAVE_CONFIG_H
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = 
+LDFLAGS = 
+LIBS = 
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+DEP_FILES = ./$(DEPDIR)/polymorph.Po ./$(DEPDIR)/soapC.Po \
+	./$(DEPDIR)/soapClient.Po ./$(DEPDIR)/soapServer.Po
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
+CXXFLAGS = -g -O2 -Wall -g -O2 -fPIC -DPIC
+CFLAGS = -Wall -g -O2 -fPIC -DPIC
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+DIST_SOURCES = $(polytest_cgi_SOURCES)
+DIST_COMMON = Makefile.am Makefile.in
+SOURCES = $(polytest_cgi_SOURCES)
+
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
 .SUFFIXES: .cpp .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../Makefile.defines $(srcdir)/../Makefile.cpp_rules $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  soapcpp2/samples/polytest/Makefile'; \
+$(srcdir)/Makefile.in:  Makefile.am $(srcdir)/../Makefile.defines $(srcdir)/../Makefile.cpp_rules $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  soapcpp2/samples/polytest/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
 
 clean-noinstPROGRAMS:
 	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
@@ -252,7 +188,7 @@
 	$(CXXLINK) $(polytest_cgi_LDFLAGS) $(polytest_cgi_OBJECTS) $(polytest_cgi_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
+	-rm -f *.$(OBJEXT) core *.core
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -262,21 +198,28 @@
 include ./$(DEPDIR)/soapClient.Po
 include ./$(DEPDIR)/soapServer.Po
 
+distclean-depend:
+	-rm -rf ./$(DEPDIR)
+
 .cpp.o:
-	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXXCOMPILE) -c -o $@ $<
+	source='$<' object='$@' libtool=no \
+	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+	$(CXXDEPMODE) $(depcomp) \
+	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
 
 .cpp.obj:
-	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+	source='$<' object='$@' libtool=no \
+	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+	$(CXXDEPMODE) $(depcomp) \
+	$(CXXCOMPILE) -c -o $@ `cygpath -w $<`
+CXXDEPMODE = depmode=gcc3
 uninstall-info-am:
 
+ETAGS = etags
+ETAGSFLAGS =
+
+tags: TAGS
+
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -285,7 +228,6 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
-tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -297,24 +239,8 @@
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	     $$tags $$unique
 
 GTAGS:
@@ -323,22 +249,19 @@
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/..
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -354,12 +277,12 @@
 	  fi; \
 	done
 check-am: all-am
-check: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) check-am
+check: check-am
 all-am: Makefile $(PROGRAMS)
+
 installdirs:
-install: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) install-am
+
+install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -370,7 +293,7 @@
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -379,7 +302,7 @@
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -390,17 +313,14 @@
 clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+
+distclean-am: clean-am distclean-compile distclean-depend \
+	distclean-generic distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
-html: html-am
-
 info: info-am
 
 info-am:
@@ -416,34 +336,25 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
+
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-noinstPROGRAMS ctags distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
+.PHONY: GTAGS all all-am check check-am clean clean-generic \
+	clean-noinstPROGRAMS distclean distclean-compile \
+	distclean-depend distclean-generic distclean-tags distdir dvi \
+	dvi-am info info-am install install-am install-data \
 	install-data-am install-exec install-exec-am install-info \
 	install-info-am install-man install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am
+	mostlyclean-generic tags uninstall uninstall-am \
+	uninstall-info-am
 
 
 $(SOAP_CPP_SRC) : $(SOAPHEADER)
