axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject cvs commit: ws-axis/c/samples/client/simple Calculator.cpp Calculator.h Makefile.in
Date Mon, 01 Nov 2004 05:31:15 GMT
samisa      2004/10/31 21:31:15

  Modified:    c/samples/client/simple Calculator.cpp Calculator.h
                        Makefile.in
  Log:
  Updated to work with latest changes on C to C++ conversion.
  
  Revision  Changes    Path
  1.7       +3 -1      ws-axis/c/samples/client/simple/Calculator.cpp
  
  Index: Calculator.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/client/simple/Calculator.cpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Calculator.cpp	27 Oct 2004 13:07:02 -0000	1.6
  +++ Calculator.cpp	1 Nov 2004 05:31:15 -0000	1.7
  @@ -8,8 +8,10 @@
   
   #include <axis/server/AxisWrapperAPI.hpp>
   
  +AXIS_CPP_NAMESPACE_USE
  +
   bool CallBase::bInitialized;
  -CallFunctions CallBase::ms_VFtable;
  +//CallFunctions CallBase::ms_VFtable;
   Calculator::Calculator(const char* pchEndpointUri)
   {
   	m_pCall = new Call();
  
  
  
  1.8       +3 -0      ws-axis/c/samples/client/simple/Calculator.h
  
  Index: Calculator.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/client/simple/Calculator.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Calculator.h	27 Oct 2004 13:07:02 -0000	1.7
  +++ Calculator.h	1 Nov 2004 05:31:15 -0000	1.8
  @@ -7,7 +7,10 @@
   #define __CALCULATOR_CLIENTSTUB_H__OF_AXIS_INCLUDED_
   
   #include <axis/client/Stub.hpp>
  +#include <axis/client/Call.hpp>
   #include <ctype.h>
  +
  +AXIS_CPP_NAMESPACE_USE
   
   class Calculator 
   {
  
  
  
  1.2       +250 -145  ws-axis/c/samples/client/simple/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/client/simple/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in	16 Aug 2004 04:55:19 -0000	1.1
  +++ Makefile.in	1 Nov 2004 05:31:15 -0000	1.2
  @@ -1,8 +1,8 @@
  -# Makefile.in generated by automake 1.6.3 from Makefile.am.
  +# Makefile.in generated by automake 1.8.3 from Makefile.am.
   # @configure_input@
   
  -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
  -# Free Software Foundation, Inc.
  +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
  +# 2003, 2004  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,158 +13,228 @@
   # PARTICULAR PURPOSE.
   
   @SET_MAKE@
  -SHELL = @SHELL@
  +
  +SOURCES = $(calculator_SOURCES)
   
   srcdir = @srcdir@
   top_srcdir = @top_srcdir@
   VPATH = @srcdir@
  -prefix = @prefix@
  -exec_prefix = @exec_prefix@
  -
  -bindir = @bindir@
  -sbindir = @sbindir@
  -libexecdir = @libexecdir@
  -datadir = @datadir@
  -sysconfdir = @sysconfdir@
  -sharedstatedir = @sharedstatedir@
  -localstatedir = @localstatedir@
  -libdir = @libdir@
  -infodir = @infodir@
  -mandir = @mandir@
  -includedir = @includedir@
  -oldincludedir = /usr/include
   pkgdatadir = $(datadir)/@PACKAGE@
   pkglibdir = $(libdir)/@PACKAGE@
   pkgincludedir = $(includedir)/@PACKAGE@
   top_builddir = ../../..
  -
  -ACLOCAL = @ACLOCAL@
  -AUTOCONF = @AUTOCONF@
  -AUTOMAKE = @AUTOMAKE@
  -AUTOHEADER = @AUTOHEADER@
  -
   am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
   INSTALL = @INSTALL@
  -INSTALL_PROGRAM = @INSTALL_PROGRAM@
  -INSTALL_DATA = @INSTALL_DATA@
   install_sh_DATA = $(install_sh) -c -m 644
   install_sh_PROGRAM = $(install_sh) -c
   install_sh_SCRIPT = $(install_sh) -c
  -INSTALL_SCRIPT = @INSTALL_SCRIPT@
   INSTALL_HEADER = $(INSTALL_DATA)
  -transform = @program_transform_name@
  +transform = $(program_transform_name)
   NORMAL_INSTALL = :
   PRE_INSTALL = :
   POST_INSTALL = :
   NORMAL_UNINSTALL = :
   PRE_UNINSTALL = :
   POST_UNINSTALL = :
  -host_alias = @host_alias@
   host_triplet = @host@
  -
  -EXEEXT = @EXEEXT@
  -OBJEXT = @OBJEXT@
  -PATH_SEPARATOR = @PATH_SEPARATOR@
  +bin_PROGRAMS = calculator$(EXEEXT)
  +subdir = samples/client/simple
  +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  +am__aclocal_m4_deps = $(top_srcdir)/configure.ac
  +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 =
  +am__installdirs = "$(DESTDIR)$(bindir)"
  +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  +PROGRAMS = $(bin_PROGRAMS)
  +am_calculator_OBJECTS = Calculator.$(OBJEXT) CalcClient.$(OBJEXT)
  +calculator_OBJECTS = $(am_calculator_OBJECTS)
  +calculator_DEPENDENCIES =
  +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
  +depcomp = $(SHELL) $(top_srcdir)/depcomp
  +am__depfiles_maybe = depfiles
  +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/CalcClient.Po \
  +@AMDEP_TRUE@	./$(DEPDIR)/Calculator.Po
  +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  +	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
  +LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
  +	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
  +	$(AM_CXXFLAGS) $(CXXFLAGS)
  +CXXLD = $(CXX)
  +CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
  +	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  +SOURCES = $(calculator_SOURCES)
  +DIST_SOURCES = $(calculator_SOURCES)
  +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
  +	html-recursive info-recursive install-data-recursive \
  +	install-exec-recursive install-info-recursive \
  +	install-recursive installcheck-recursive installdirs-recursive \
  +	pdf-recursive ps-recursive uninstall-info-recursive \
  +	uninstall-recursive
  +ETAGS = etags
  +CTAGS = ctags
  +DIST_SUBDIRS = $(SUBDIRS)
  +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  +ACLOCAL = @ACLOCAL@
  +AMDEP_FALSE = @AMDEP_FALSE@
  +AMDEP_TRUE = @AMDEP_TRUE@
   AMTAR = @AMTAR@
   APACHE2BUILD = @APACHE2BUILD@
   APACHE2INC = @APACHE2INC@
   APACHEBUILD = @APACHEBUILD@
   APACHEINC = @APACHEINC@
  -AS = @AS@
  +AR = @AR@
  +AUTOCONF = @AUTOCONF@
  +AUTOHEADER = @AUTOHEADER@
  +AUTOMAKE = @AUTOMAKE@
   AWK = @AWK@
   CC = @CC@
  +CCDEPMODE = @CCDEPMODE@
  +CFLAGS = @CFLAGS@
  +CPP = @CPP@
  +CPPFLAGS = @CPPFLAGS@
   CXX = @CXX@
  +CXXCPP = @CXXCPP@
  +CXXDEPMODE = @CXXDEPMODE@
  +CXXFLAGS = @CXXFLAGS@
  +CYGPATH_W = @CYGPATH_W@
  +DEFS = @DEFS@
   DEPDIR = @DEPDIR@
  -DLLTOOL = @DLLTOOL@
   ECHO = @ECHO@
  +ECHO_C = @ECHO_C@
  +ECHO_N = @ECHO_N@
  +ECHO_T = @ECHO_T@
  +EGREP = @EGREP@
  +EXEEXT = @EXEEXT@
   EXPATBUILD = @EXPATBUILD@
   EXPATINC = @EXPATINC@
   EXPATLIB = @EXPATLIB@
  +F77 = @F77@
  +FFLAGS = @FFLAGS@
  +INSTALL_DATA = @INSTALL_DATA@
  +INSTALL_PROGRAM = @INSTALL_PROGRAM@
  +INSTALL_SCRIPT = @INSTALL_SCRIPT@
   INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  +LDFLAGS = @LDFLAGS@
  +LIBOBJS = @LIBOBJS@
  +LIBS = @LIBS@
   LIBTOOL = @LIBTOOL@
   LIBWWWBUILD = @LIBWWWBUILD@
   LINKCLIENTLIB = @LINKCLIENTLIB@
   LN_S = @LN_S@
  -OBJDUMP = @OBJDUMP@
  +LTLIBOBJS = @LTLIBOBJS@
  +MAKEINFO = @MAKEINFO@
  +OBJEXT = @OBJEXT@
   PACKAGE = @PACKAGE@
  +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  +PACKAGE_NAME = @PACKAGE_NAME@
  +PACKAGE_STRING = @PACKAGE_STRING@
  +PACKAGE_TARNAME = @PACKAGE_TARNAME@
  +PACKAGE_VERSION = @PACKAGE_VERSION@
  +PATH_SEPARATOR = @PATH_SEPARATOR@
   RANLIB = @RANLIB@
   SAMPLESBUILD = @SAMPLESBUILD@
  +SET_MAKE = @SET_MAKE@
  +SHELL = @SHELL@
   STRIP = @STRIP@
   TESTCASESBUILD = @TESTCASESBUILD@
   VERSION = @VERSION@
   XERCESCBUILD = @XERCESCBUILD@
   XERCESCINC = @XERCESCINC@
   XERCESCLIB = @XERCESCLIB@
  +ac_ct_AR = @ac_ct_AR@
  +ac_ct_CC = @ac_ct_CC@
  +ac_ct_CXX = @ac_ct_CXX@
  +ac_ct_F77 = @ac_ct_F77@
  +ac_ct_RANLIB = @ac_ct_RANLIB@
  +ac_ct_STRIP = @ac_ct_STRIP@
  +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
  +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
   am__include = @am__include@
  +am__leading_dot = @am__leading_dot@
   am__quote = @am__quote@
  +bindir = @bindir@
  +build = @build@
  +build_alias = @build_alias@
  +build_cpu = @build_cpu@
  +build_os = @build_os@
  +build_vendor = @build_vendor@
  +datadir = @datadir@
  +exec_prefix = @exec_prefix@
  +host = @host@
  +host_alias = @host_alias@
  +host_cpu = @host_cpu@
  +host_os = @host_os@
  +host_vendor = @host_vendor@
  +includedir = @includedir@
  +infodir = @infodir@
   install_sh = @install_sh@
  -bin_PROGRAMS = calculator
  +libdir = @libdir@
  +libexecdir = @libexecdir@
  +localstatedir = @localstatedir@
  +mandir = @mandir@
  +mkdir_p = @mkdir_p@
  +oldincludedir = @oldincludedir@
  +prefix = @prefix@
  +program_transform_name = @program_transform_name@
  +sbindir = @sbindir@
  +sharedstatedir = @sharedstatedir@
  +sysconfdir = @sysconfdir@
  +target_alias = @target_alias@
   SUBDIRS = 
   AM_CPPFLAGS = $(CPPFLAGS)
   calculator_SOURCES = Calculator.cpp CalcClient.cpp
   calculator_LDADD = @LINKCLIENTLIB@
   INCLUDES = -I$(AXISCPP_HOME)/include
  -subdir = samples/client/simple
  -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  -CONFIG_HEADER = $(top_builddir)/config.h
  -CONFIG_CLEAN_FILES =
  -bin_PROGRAMS = calculator$(EXEEXT)
  -PROGRAMS = $(bin_PROGRAMS)
  -
  -am_calculator_OBJECTS = Calculator.$(OBJEXT) CalcClient.$(OBJEXT)
  -calculator_OBJECTS = $(am_calculator_OBJECTS)
  -calculator_DEPENDENCIES =
  -calculator_LDFLAGS =
  -
  -DEFS = @DEFS@
  -DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
  -CPPFLAGS = @CPPFLAGS@
  -LDFLAGS = @LDFLAGS@
  -LIBS = @LIBS@
  -depcomp = $(SHELL) $(top_srcdir)/depcomp
  -am__depfiles_maybe = depfiles
  -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/CalcClient.Po \
  -@AMDEP_TRUE@	./$(DEPDIR)/Calculator.Po
  -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  -	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
  -LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
  -	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
  -	$(AM_CXXFLAGS) $(CXXFLAGS)
  -CXXLD = $(CXX)
  -CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
  -	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  -CXXFLAGS = @CXXFLAGS@
  -DIST_SOURCES = $(calculator_SOURCES)
  -
  -RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
  -	uninstall-info-recursive all-recursive install-data-recursive \
  -	install-exec-recursive installdirs-recursive install-recursive \
  -	uninstall-recursive check-recursive installcheck-recursive
  -DIST_COMMON = Makefile.am Makefile.in
  -DIST_SUBDIRS = $(SUBDIRS)
  -SOURCES = $(calculator_SOURCES)
  -
   all: all-recursive
   
   .SUFFIXES:
   .SUFFIXES: .cpp .lo .o .obj
  -$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
  +$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(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) --gnu  samples/client/simple/Makefile';
\
   	cd $(top_srcdir) && \
   	  $(AUTOMAKE) --gnu  samples/client/simple/Makefile
  -Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
  -	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
  -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  +.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
   install-binPROGRAMS: $(bin_PROGRAMS)
   	@$(NORMAL_INSTALL)
  -	$(mkinstalldirs) $(DESTDIR)$(bindir)
  +	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
   	@list='$(bin_PROGRAMS)'; for p in $$list; do \
   	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
   	  if test -f $$p \
   	     || test -f $$p1 \
   	  ; then \
   	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
  -	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p
$(DESTDIR)$(bindir)/$$f"; \
  -	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f;
\
  +	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p'
'$(DESTDIR)$(bindir)/$$f'"; \
  +	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f"
|| exit 1; \
   	  else :; fi; \
   	done
   
  @@ -172,8 +242,8 @@
   	@$(NORMAL_UNINSTALL)
   	@list='$(bin_PROGRAMS)'; for p in $$list; do \
   	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
  -	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
  -	  rm -f $(DESTDIR)$(bindir)/$$f; \
  +	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
  +	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
   	done
   
   clean-binPROGRAMS:
  @@ -187,7 +257,7 @@
   	$(CXXLINK) $(calculator_LDFLAGS) $(calculator_OBJECTS) $(calculator_LDADD) $(LIBS)
   
   mostlyclean-compile:
  -	-rm -f *.$(OBJEXT) core *.core
  +	-rm -f *.$(OBJEXT)
   
   distclean-compile:
   	-rm -f *.tab.c
  @@ -195,27 +265,29 @@
   @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CalcClient.Po@am__quote@
   @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Calculator.Po@am__quote@
   
  -distclean-depend:
  -	-rm -rf ./$(DEPDIR)
  -
   .cpp.o:
  -@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  -@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
  -@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  -	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
  +@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<;
\
  +@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo";
exit 1; fi
  +@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  +@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo'
@AMDEPBACKSLASH@
  +@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  +@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
   
   .cpp.obj:
  -@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  -@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
  -@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  -	$(CXXCOMPILE) -c -o $@ `cygpath -w $<`
  +@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W)
'$<'`; \
  +@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo";
exit 1; fi
  +@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  +@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo'
@AMDEPBACKSLASH@
  +@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  +@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
   
   .cpp.lo:
  -@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  -@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
  -@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  -	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
  -CXXDEPMODE = @CXXDEPMODE@
  +@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@
$<; \
  +@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo";
exit 1; fi
  +@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  +@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo'
@AMDEPBACKSLASH@
  +@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  +@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
   
   mostlyclean-libtool:
   	-rm -f *.lo
  @@ -281,11 +353,10 @@
   	list='$(SUBDIRS)'; for subdir in $$list; do \
   	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
   	done
  -
  -ETAGS = etags
  -ETAGSFLAGS =
  -
  -tags: TAGS
  +ctags-recursive:
  +	list='$(SUBDIRS)'; for subdir in $$list; do \
  +	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  +	done
   
   ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
   	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  @@ -295,14 +366,21 @@
   	  $(AWK) '    { files[$$0] = 1; } \
   	       END { for (i in files) print i; }'`; \
   	mkid -fID $$unique
  +tags: TAGS
   
   TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
   		$(TAGS_FILES) $(LISP)
   	tags=; \
   	here=`pwd`; \
  +	if (etags --etags-include --version) >/dev/null 2>&1; then \
  +	  include_option=--etags-include; \
  +	else \
  +	  include_option=--include; \
  +	fi; \
   	list='$(SUBDIRS)'; for subdir in $$list; do \
   	  if test "$$subdir" = .; then :; else \
  -	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
  +	    test -f $$subdir/TAGS && \
  +	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
   	  fi; \
   	done; \
   	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  @@ -314,6 +392,20 @@
   	test -z "$(ETAGS_ARGS)$$tags$$unique" \
   	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
   	     $$tags $$unique
  +ctags: CTAGS
  +CTAGS: ctags-recursive $(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) \
  +	     $$tags $$unique
   
   GTAGS:
   	here=`$(am__cd) $(top_builddir) && pwd` \
  @@ -321,19 +413,21 @@
   	  && gtags -i $(GTAGS_ARGS) $$here
   
   distclean-tags:
  -	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
  -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  -
  -top_distdir = ../../..
  -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
  +	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
   
   distdir: $(DISTFILES)
  -	@list='$(DISTFILES)'; for file in $$list; do \
  +	@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; \
   	  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"; \
  -	    $(mkinstalldirs) "$(distdir)$$dir"; \
  +	    $(mkdir_p) "$(distdir)$$dir"; \
   	  else \
   	    dir=''; \
   	  fi; \
  @@ -350,13 +444,13 @@
   	done
   	list='$(SUBDIRS)'; for subdir in $$list; do \
   	  if test "$$subdir" = .; then :; else \
  -	    test -d $(distdir)/$$subdir \
  -	    || mkdir $(distdir)/$$subdir \
  +	    test -d "$(distdir)/$$subdir" \
  +	    || mkdir "$(distdir)/$$subdir" \
   	    || exit 1; \
   	    (cd $$subdir && \
   	      $(MAKE) $(AM_MAKEFLAGS) \
  -	        top_distdir="$(top_distdir)" \
  -	        distdir=../$(distdir)/$$subdir \
  +	        top_distdir="../$(top_distdir)" \
  +	        distdir="../$(distdir)/$$subdir" \
   	        distdir) \
   	      || exit 1; \
   	  fi; \
  @@ -366,8 +460,9 @@
   all-am: Makefile $(PROGRAMS)
   installdirs: installdirs-recursive
   installdirs-am:
  -	$(mkinstalldirs) $(DESTDIR)$(bindir)
  -
  +	for dir in "$(DESTDIR)$(bindir)"; do \
  +	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
  +	done
   install: install-recursive
   install-exec: install-exec-recursive
   install-data: install-data-recursive
  @@ -379,7 +474,7 @@
   installcheck: installcheck-recursive
   install-strip:
   	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
  -	  INSTALL_STRIP_FLAG=-s \
  +	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
   	  `test -z '$(STRIP)' || \
   	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
   mostlyclean-generic:
  @@ -387,7 +482,7 @@
   clean-generic:
   
   distclean-generic:
  -	-rm -f Makefile $(CONFIG_CLEAN_FILES)
  +	-rm -f $(CONFIG_CLEAN_FILES)
   
   maintainer-clean-generic:
   	@echo "This command is intended for maintainers to use"
  @@ -397,14 +492,17 @@
   clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
   
   distclean: distclean-recursive
  -
  -distclean-am: clean-am distclean-compile distclean-depend \
  -	distclean-generic distclean-libtool distclean-tags
  +	-rm -rf ./$(DEPDIR)
  +	-rm -f Makefile
  +distclean-am: clean-am distclean-compile distclean-generic \
  +	distclean-libtool distclean-tags
   
   dvi: dvi-recursive
   
   dvi-am:
   
  +html: html-recursive
  +
   info: info-recursive
   
   info-am:
  @@ -420,7 +518,8 @@
   installcheck-am:
   
   maintainer-clean: maintainer-clean-recursive
  -
  +	-rm -rf ./$(DEPDIR)
  +	-rm -f Makefile
   maintainer-clean-am: distclean-am maintainer-clean-generic
   
   mostlyclean: mostlyclean-recursive
  @@ -428,26 +527,32 @@
   mostlyclean-am: mostlyclean-compile mostlyclean-generic \
   	mostlyclean-libtool
   
  +pdf: pdf-recursive
  +
  +pdf-am:
  +
  +ps: ps-recursive
  +
  +ps-am:
  +
   uninstall-am: uninstall-binPROGRAMS uninstall-info-am
   
   uninstall-info: uninstall-info-recursive
   
  -.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
  -	clean-binPROGRAMS clean-generic clean-libtool clean-recursive \
  -	distclean distclean-compile distclean-depend distclean-generic \
  -	distclean-libtool distclean-recursive distclean-tags distdir \
  -	dvi dvi-am dvi-recursive info info-am info-recursive install \
  -	install-am install-binPROGRAMS install-data install-data-am \
  -	install-data-recursive install-exec install-exec-am \
  -	install-exec-recursive install-info install-info-am \
  -	install-info-recursive install-man install-recursive \
  -	install-strip installcheck installcheck-am installdirs \
  -	installdirs-am installdirs-recursive maintainer-clean \
  -	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
  -	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
  -	mostlyclean-recursive tags tags-recursive uninstall \
  -	uninstall-am uninstall-binPROGRAMS uninstall-info-am \
  -	uninstall-info-recursive uninstall-recursive
  +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
  +	clean clean-binPROGRAMS clean-generic clean-libtool \
  +	clean-recursive ctags ctags-recursive distclean \
  +	distclean-compile distclean-generic distclean-libtool \
  +	distclean-recursive distclean-tags distdir dvi dvi-am html \
  +	html-am info info-am install install-am install-binPROGRAMS \
  +	install-data install-data-am install-exec install-exec-am \
  +	install-info install-info-am install-man install-strip \
  +	installcheck installcheck-am installdirs installdirs-am \
  +	maintainer-clean maintainer-clean-generic \
  +	maintainer-clean-recursive mostlyclean mostlyclean-compile \
  +	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
  +	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
  +	uninstall-binPROGRAMS uninstall-info-am
   
   # 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.
  
  
  

Mime
View raw message