[Cpptool-cvs] rfta/src/rfta Makefile.in,1.8,1.9 Makefile.am,1.15,1.16

[<sve...@us...>]

Update of /cvsroot/cpptool/rfta/src/rfta
In directory sc8-pr-cvs1:/tmp/cvs-serv2713/src/rfta

Modified Files:
	Makefile.in Makefile.am 
Log Message:
updated makefiles


Index: Makefile.in
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile.in	15 Dec 2002 02:39:21 -0000	1.8
--- Makefile.in	21 Apr 2003 03:02:45 -0000	1.9
***************
*** 66,80 ****
  
  INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
! noinst_LIBRARIES = librftatools.a
  check_PROGRAMS = UnitTests
  TESTS = ./UnitTests
! librftatools_a_SOURCES =  	IdentifierResolver.cpp 	IdentifierResolverContext.cpp 	IdentifierVisitor.cpp 	LineBasedTextDocument.cpp 	ParserTools.cpp 	PlainTextDocument.cpp 	RenameTempRefactoring.cpp 	RefactoringBase.cpp 	RefactoringError.cpp 	ReplaceTextTransform.cpp 	Scope.cpp 	ScopeBuilder.cpp 	ScopeGenerator.cpp 	ScopesHolder.cpp 	SourceBasedTestBase.cpp 	SourceLocationRange.cpp 	SourceBuilder.cpp 	SplitTempRefactoring.cpp 	StdAfx.cpp 	TextDocument.cpp 	ToolsBox.cpp 	TransformList.cpp 	VariableDeclCollector.cpp 	VariableDeclVisitor.cpp 	rfta.cpp  
! 
! UnitTests_SOURCES =  	IdentifierVisitorTest.cpp 	LineBasedTextDocumentTest.cpp 	MockLineBasedTextDocument.cpp 	MockTextDocument.cpp 	RenameTempRefactoringTest.cpp 	ReplaceTextTransformTest.cpp 	ScopeGeneratorTest.cpp 	ScopesHolderTest.cpp 	ScopeGeneratorTestBase.cpp 	SourceBasedTestBase.cpp 	SplitTempRefactoringTest.cpp 	ToolsBoxTest.cpp 	TransformListTest.cpp 	VariableDeclCollectorTest.cpp 	VariableDeclVisitorTest.cpp 	UnitTests.cpp 	RftaTest.cpp
! 
  
! UnitTests_LDADD = -L$(top_builddir)/lib -lcppunit -ldl 	 -L../rftaparser  -L. -lrftatools -lrfta
  
! UnitTests_DEPENDENCIES = librftatools.a ../rftaparser/librfta.a
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_CLEAN_FILES = 
--- 66,78 ----
  
  INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
! noinst_LIBRARIES = librfta.a
  check_PROGRAMS = UnitTests
  TESTS = ./UnitTests
! librfta_a_SOURCES =  	CodeModel.cpp 	CodeModelElement.cpp 	CodeModelExpressions.cpp 	CodeModelStatements.cpp 	CodeRewriter.cpp 	IdentifierResolverContext.cpp 	IdentifierResolver.cpp 	IdentifierResolverStrategy.cpp 	IdentifierVisitor.cpp 	IndentLevelManager.cpp 	InlineTempRefactoring.cpp 	LineBasedTextDocument.cpp 	MockIdentifierResolverStrategy.cpp 	MockLineBasedTextDocument.cpp 	MockTextDocument.cpp 	ParserTools.cpp 	PlainTextDocument.cpp 	ReduceTempScopeRefactoring.cpp 	RefactoringBase.cpp 	RefactoringError.cpp 	RenameTempRefactoring.cpp 	ReplaceTextTransform.cpp 	rfta.cpp 	SourceBuilder.cpp 	SplitDeclarationRefactoring.cpp 	SplitTempRefactoring.cpp 	StatementsVisitor.cpp 	StdAfx.cpp 	TextDocument.cpp 	ToolsBox.cpp 	TransformList.cpp 	VariableDeclCollector.cpp 	VariableDeclVisitor.cpp
  
! UnitTests_SOURCES =  	UnitTests.cpp 	CodeModelGeneratorTest.cpp 	CodeWriterInsertTest.cpp 	CodeWriterTestBase.cpp 	CodeWriterTest.cpp 	IdentifierResolverContextTest.cpp 	IdentifierResolverTest.cpp 	IdentifierVisitorTest.cpp 	InlineTempRefactoringTest.cpp 	LineBasedTextDocumentTest.cpp 	ReduceTempScopeRefactoringTest.cpp 	RenameTempRefactoringTest.cpp 	ReplaceTextTransformTest.cpp 	RftaTest.cpp 	SourceBasedTestBase.cpp 	SplitDeclarationRefactoringTest.cpp 	SplitTempRefactoringTest.cpp 	ToolsBoxTest.cpp 	TransformListTest.cpp 	VariableDeclCollectorTest.cpp 	VariableDeclVisitorTest.cpp
  
! UnitTests_LDADD = -L$(top_builddir)/lib -L../rftaparser  -L. -lrfta -lrftaparser -lcppunit -ldl
! UnitTests_DEPENDENCIES = librfta.a ../rftaparser/librftaparser.a
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_CLEAN_FILES = 
***************
*** 86,106 ****
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
! librftatools_a_LIBADD = 
! librftatools_a_OBJECTS =  IdentifierResolver.o \
! IdentifierResolverContext.o IdentifierVisitor.o LineBasedTextDocument.o \
! ParserTools.o PlainTextDocument.o RenameTempRefactoring.o \
! RefactoringBase.o RefactoringError.o ReplaceTextTransform.o Scope.o \
! ScopeBuilder.o ScopeGenerator.o ScopesHolder.o SourceBasedTestBase.o \
! SourceLocationRange.o SourceBuilder.o SplitTempRefactoring.o StdAfx.o \
! TextDocument.o ToolsBox.o TransformList.o VariableDeclCollector.o \
! VariableDeclVisitor.o rfta.o
  AR = ar
! UnitTests_OBJECTS =  IdentifierVisitorTest.o LineBasedTextDocumentTest.o \
! MockLineBasedTextDocument.o MockTextDocument.o \
! RenameTempRefactoringTest.o ReplaceTextTransformTest.o \
! ScopeGeneratorTest.o ScopesHolderTest.o ScopeGeneratorTestBase.o \
! SourceBasedTestBase.o SplitTempRefactoringTest.o ToolsBoxTest.o \
! TransformListTest.o VariableDeclCollectorTest.o \
! VariableDeclVisitorTest.o UnitTests.o RftaTest.o
  UnitTests_LDFLAGS = 
  CXXFLAGS = @CXXFLAGS@
--- 84,110 ----
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
! librfta_a_LIBADD = 
! librfta_a_OBJECTS =  CodeModel.o CodeModelElement.o \
! CodeModelExpressions.o CodeModelStatements.o CodeRewriter.o \
! IdentifierResolverContext.o IdentifierResolver.o \
! IdentifierResolverStrategy.o IdentifierVisitor.o IndentLevelManager.o \
! InlineTempRefactoring.o LineBasedTextDocument.o \
! MockIdentifierResolverStrategy.o MockLineBasedTextDocument.o \
! MockTextDocument.o ParserTools.o PlainTextDocument.o \
! ReduceTempScopeRefactoring.o RefactoringBase.o RefactoringError.o \
! RenameTempRefactoring.o ReplaceTextTransform.o rfta.o SourceBuilder.o \
! SplitDeclarationRefactoring.o SplitTempRefactoring.o \
! StatementsVisitor.o StdAfx.o TextDocument.o ToolsBox.o TransformList.o \
! VariableDeclCollector.o VariableDeclVisitor.o
  AR = ar
! UnitTests_OBJECTS =  UnitTests.o CodeModelGeneratorTest.o \
! CodeWriterInsertTest.o CodeWriterTestBase.o CodeWriterTest.o \
! IdentifierResolverContextTest.o IdentifierResolverTest.o \
! IdentifierVisitorTest.o InlineTempRefactoringTest.o \
! LineBasedTextDocumentTest.o ReduceTempScopeRefactoringTest.o \
! RenameTempRefactoringTest.o ReplaceTextTransformTest.o RftaTest.o \
! SourceBasedTestBase.o SplitDeclarationRefactoringTest.o \
! SplitTempRefactoringTest.o ToolsBoxTest.o TransformListTest.o \
! VariableDeclCollectorTest.o VariableDeclVisitorTest.o
  UnitTests_LDFLAGS = 
  CXXFLAGS = @CXXFLAGS@
***************
*** 115,132 ****
  TAR = gtar
  GZIP_ENV = --best
! DEP_FILES =  .deps/IdentifierResolver.P \
! .deps/IdentifierResolverContext.P .deps/IdentifierVisitor.P \
! .deps/IdentifierVisitorTest.P .deps/LineBasedTextDocument.P \
! .deps/LineBasedTextDocumentTest.P .deps/MockLineBasedTextDocument.P \
! .deps/MockTextDocument.P .deps/ParserTools.P .deps/PlainTextDocument.P \
! .deps/RefactoringBase.P .deps/RefactoringError.P \
! .deps/RenameTempRefactoring.P .deps/RenameTempRefactoringTest.P \
! .deps/ReplaceTextTransform.P .deps/ReplaceTextTransformTest.P \
! .deps/RftaTest.P .deps/Scope.P .deps/ScopeBuilder.P \
! .deps/ScopeGenerator.P .deps/ScopeGeneratorTest.P \
! .deps/ScopeGeneratorTestBase.P .deps/ScopesHolder.P \
! .deps/ScopesHolderTest.P .deps/SourceBasedTestBase.P \
! .deps/SourceBuilder.P .deps/SourceLocationRange.P \
! .deps/SplitTempRefactoring.P .deps/SplitTempRefactoringTest.P \
  .deps/StdAfx.P .deps/TextDocument.P .deps/ToolsBox.P \
  .deps/ToolsBoxTest.P .deps/TransformList.P .deps/TransformListTest.P \
--- 119,145 ----
  TAR = gtar
  GZIP_ENV = --best
! DEP_FILES =  .deps/CodeModel.P .deps/CodeModelElement.P \
! .deps/CodeModelExpressions.P .deps/CodeModelGeneratorTest.P \
! .deps/CodeModelStatements.P .deps/CodeRewriter.P \
! .deps/CodeWriterInsertTest.P .deps/CodeWriterTest.P \
! .deps/CodeWriterTestBase.P .deps/IdentifierResolver.P \
! .deps/IdentifierResolverContext.P .deps/IdentifierResolverContextTest.P \
! .deps/IdentifierResolverStrategy.P .deps/IdentifierResolverTest.P \
! .deps/IdentifierVisitor.P .deps/IdentifierVisitorTest.P \
! .deps/IndentLevelManager.P .deps/InlineTempRefactoring.P \
! .deps/InlineTempRefactoringTest.P .deps/LineBasedTextDocument.P \
! .deps/LineBasedTextDocumentTest.P \
! .deps/MockIdentifierResolverStrategy.P \
! .deps/MockLineBasedTextDocument.P .deps/MockTextDocument.P \
! .deps/ParserTools.P .deps/PlainTextDocument.P \
! .deps/ReduceTempScopeRefactoring.P \
! .deps/ReduceTempScopeRefactoringTest.P .deps/RefactoringBase.P \
! .deps/RefactoringError.P .deps/RenameTempRefactoring.P \
! .deps/RenameTempRefactoringTest.P .deps/ReplaceTextTransform.P \
! .deps/ReplaceTextTransformTest.P .deps/RftaTest.P \
! .deps/SourceBasedTestBase.P .deps/SourceBuilder.P \
! .deps/SplitDeclarationRefactoring.P \
! .deps/SplitDeclarationRefactoringTest.P .deps/SplitTempRefactoring.P \
! .deps/SplitTempRefactoringTest.P .deps/StatementsVisitor.P \
  .deps/StdAfx.P .deps/TextDocument.P .deps/ToolsBox.P \
  .deps/ToolsBoxTest.P .deps/TransformList.P .deps/TransformListTest.P \
***************
*** 134,139 ****
  .deps/VariableDeclCollectorTest.P .deps/VariableDeclVisitor.P \
  .deps/VariableDeclVisitorTest.P .deps/rfta.P
! SOURCES = $(librftatools_a_SOURCES) $(UnitTests_SOURCES)
! OBJECTS = $(librftatools_a_OBJECTS) $(UnitTests_OBJECTS)
  
  all: all-redirect
--- 147,152 ----
  .deps/VariableDeclCollectorTest.P .deps/VariableDeclVisitor.P \
  .deps/VariableDeclVisitorTest.P .deps/rfta.P
! SOURCES = $(librfta_a_SOURCES) $(UnitTests_SOURCES)
! OBJECTS = $(librfta_a_OBJECTS) $(UnitTests_OBJECTS)
  
  all: all-redirect
***************
*** 173,180 ****
  maintainer-clean-compile:
  
! librftatools.a: $(librftatools_a_OBJECTS) $(librftatools_a_DEPENDENCIES)
! 	-rm -f librftatools.a
! 	$(AR) cru librftatools.a $(librftatools_a_OBJECTS) $(librftatools_a_LIBADD)
! 	$(RANLIB) librftatools.a
  
  mostlyclean-checkPROGRAMS:
--- 186,193 ----
  maintainer-clean-compile:
  
! librfta.a: $(librfta_a_OBJECTS) $(librfta_a_DEPENDENCIES)
! 	-rm -f librfta.a
! 	$(AR) cru librfta.a $(librfta_a_OBJECTS) $(librfta_a_LIBADD)
! 	$(RANLIB) librfta.a
  
  mostlyclean-checkPROGRAMS:
***************
*** 395,398 ****
--- 408,412 ----
  maintainer-clean-generic clean mostlyclean distclean maintainer-clean
  
+ #	CodeModelGeneratorTest.cpp\
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rfta/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile.am	16 Dec 2002 21:55:41 -0000	1.15
--- Makefile.am	21 Apr 2003 03:02:45 -0000	1.16
***************
*** 1,21 ****
  INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
! noinst_LIBRARIES = librftatools.a
  check_PROGRAMS = UnitTests
  TESTS = ./UnitTests
! librftatools_a_SOURCES = \
! 	IdentifierResolver.cpp\
  	IdentifierResolverContext.cpp\
  	IdentifierVisitor.cpp\
  	LineBasedTextDocument.cpp\
  	ParserTools.cpp\
  	PlainTextDocument.cpp\
! 	RenameTempRefactoring.cpp\
  	RefactoringBase.cpp\
  	RefactoringError.cpp\
  	ReplaceTextTransform.cpp\
! 	SourceBasedTestBase.cpp\
! 	SourceLocationRange.cpp\
  	SourceBuilder.cpp\
  	SplitTempRefactoring.cpp\
  	StdAfx.cpp\
  	TextDocument.cpp\
--- 1,34 ----
  INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
! noinst_LIBRARIES = librfta.a
  check_PROGRAMS = UnitTests
  TESTS = ./UnitTests
! librfta_a_SOURCES =\
! 	CodeModel.cpp\
! 	CodeModelElement.cpp\
! 	CodeModelExpressions.cpp\
! 	CodeModelStatements.cpp\
! 	CodeRewriter.cpp\
  	IdentifierResolverContext.cpp\
+ 	IdentifierResolver.cpp\
+ 	IdentifierResolverStrategy.cpp\
  	IdentifierVisitor.cpp\
+ 	IndentLevelManager.cpp\
+ 	InlineTempRefactoring.cpp\
  	LineBasedTextDocument.cpp\
+ 	MockIdentifierResolverStrategy.cpp\
+ 	MockLineBasedTextDocument.cpp\
+ 	MockTextDocument.cpp\
  	ParserTools.cpp\
  	PlainTextDocument.cpp\
! 	ReduceTempScopeRefactoring.cpp\
  	RefactoringBase.cpp\
  	RefactoringError.cpp\
+ 	RenameTempRefactoring.cpp\
  	ReplaceTextTransform.cpp\
! 	rfta.cpp\
  	SourceBuilder.cpp\
+ 	SplitDeclarationRefactoring.cpp\
  	SplitTempRefactoring.cpp\
+ 	StatementsVisitor.cpp\
  	StdAfx.cpp\
  	TextDocument.cpp\
***************
*** 23,45 ****
  	TransformList.cpp\
  	VariableDeclCollector.cpp\
! 	VariableDeclVisitor.cpp\
! 	rfta.cpp  
! UnitTests_SOURCES = \
  	IdentifierVisitorTest.cpp\
  	LineBasedTextDocumentTest.cpp\
! 	MockLineBasedTextDocument.cpp\
! 	MockTextDocument.cpp\
  	RenameTempRefactoringTest.cpp\
  	ReplaceTextTransformTest.cpp\
  	SourceBasedTestBase.cpp\
  	SplitTempRefactoringTest.cpp\
  	ToolsBoxTest.cpp\
  	TransformListTest.cpp\
  	VariableDeclCollectorTest.cpp\
! 	VariableDeclVisitorTest.cpp\
! 	UnitTests.cpp\
! 	RftaTest.cpp
! 
! UnitTests_LDADD =  -L$(top_builddir)/lib -lcppunit -ldl\
! 	 -L../rftaparser  -L. -lrftatools -lrfta
! UnitTests_DEPENDENCIES = librftatools.a ../rftaparser/librfta.a
\ No newline at end of file
--- 36,63 ----
  	TransformList.cpp\
  	VariableDeclCollector.cpp\
! 	VariableDeclVisitor.cpp
! UnitTests_SOURCES =\
! 	UnitTests.cpp\
! 	CodeModelGeneratorTest.cpp\
! 	CodeWriterInsertTest.cpp\
! 	CodeWriterTestBase.cpp\
! 	CodeWriterTest.cpp\
! 	IdentifierResolverContextTest.cpp\
! 	IdentifierResolverTest.cpp\
  	IdentifierVisitorTest.cpp\
+ 	InlineTempRefactoringTest.cpp\
  	LineBasedTextDocumentTest.cpp\
! 	ReduceTempScopeRefactoringTest.cpp\
  	RenameTempRefactoringTest.cpp\
  	ReplaceTextTransformTest.cpp\
+ 	RftaTest.cpp\
  	SourceBasedTestBase.cpp\
+ 	SplitDeclarationRefactoringTest.cpp\
  	SplitTempRefactoringTest.cpp\
  	ToolsBoxTest.cpp\
  	TransformListTest.cpp\
  	VariableDeclCollectorTest.cpp\
! 	VariableDeclVisitorTest.cpp
! UnitTests_LDADD =  -L$(top_builddir)/lib -L../rftaparser  -L. -lrfta -lrftaparser -lcppunit -ldl
! UnitTests_DEPENDENCIES = librfta.a ../rftaparser/librftaparser.a
! #	CodeModelGeneratorTest.cpp\