[Rose-commits] r32 - in trunk: . config docs docs/Rose
docs/Rose/Tutorial exampleTranslators exampleTranslators/AstCopyReplTester
exampleTranslators/DOTGenerator exampleTranslators/PDFGenerator
exampleTranslators/defaultTranslator exampleTranslators/documentedExamples
exampleTranslators/documentedExamples/AstRewriteExamples
exampleTranslators/documentedExamples/dataBaseExamples
exampleTranslators/documentedExamples/simpleTranslatorExamples projects
projects/BabelPreprocessor projects/BinaryCloneDetection
projects/BinaryCloneDetection/gui projects/BinaryContextLookup
projects/C_to_Promela projects/CloneDetection projects/DatalogAnalysis
projects/DatalogAnalysis/relationTranslatorGenerator
projects/DatalogAnalysis/src projects/DatalogAnalysis/src/DBFactories
projects/DatalogAnalysis/tests projects/DistributedMemoryAnalysisCompass
projects/DocumentationGenerator projects/FiniteStateModelChecker
projects/MPICodeMotion projects/OpenMP_Translator
projects/OpenMP_Translator/tests
projects/OpenMP_Translator/tests/cvalidationsuite
projects/OpenMP_Translator/tests/developmentTests
projects/OpenMP_Translator/tests/epcc-c
projects/OpenMP_Translator/tests/npb2.3-omp-c
projects/OpenMP_Translator/tests/npb2.3-omp-c/BT
projects/OpenMP_Translator/tests/npb2.3-omp-c/CG
projects/OpenMP_Translator/tests/npb2.3-omp-c/EP
projects/OpenMP_Translator/tests/npb2.3-omp-c/FT
projects/OpenMP_Translator/tests/npb2.3-omp-c/IS
projects/OpenMP_Translator/tests/npb2.3-omp-c/LU
projects/OpenMP_Translator/tests/npb2.3-omp-c/MG
projects/OpenMP_Translator/tests/npb2.3-omp-c/SP projects/UpcTranslation
projects/UpcTranslation/tests projects/arrayOptimization
projects/arrayOptimization/test projects/assemblyToSourceAst
projects/binCompass projects/binCompass/analyses
projects/binCompass/graphanalyses projects/binaryVisualization
projects/bugSeeding projects/checkPointExample projects/compass
projects/compass/src projects/compass/src/compassSupport
projects/compass/src/util projects/compass/src/util/C-API
projects/compass/src/util/MPIAbstraction proje! cts/comp
liaoch at osp5.lbl.gov
liaoch at osp5.lbl.gov
Fri Sep 12 13:14:13 PDT 2008
Author: liaoch
Date: 2008-09-12 13:14:11 -0700 (Fri, 12 Sep 2008)
New Revision: 32
Added:
trunk/config/support-windows.m4
trunk/projects/BinaryCloneDetection/gui/
trunk/projects/BinaryCloneDetection/gui/Makefile.am
trunk/projects/BinaryCloneDetection/gui/Makefile.in
trunk/projects/BinaryCloneDetection/gui/binaryCloneGui.C
trunk/projects/BinaryCloneDetection/gui/binaryCloneMainGui.C
trunk/projects/assemblyToSourceAst/x86AssemblyToNetlist.C
trunk/tests/roseTests/astOutliningTests/moreTest1.c
Removed:
trunk/config/qrose.m4
trunk/exampleTranslators/graphicalUserInterfaceExamples/
trunk/src/roseIndependentSupport/graphicalUserInterface/
Modified:
trunk/Makefile.in
trunk/aclocal.m4
trunk/config/Makefile.for.ROSE.includes.and.libs
trunk/config/Makefile.in
trunk/config/qrose_indigo_1.m4
trunk/config/support-binary-analysis.m4
trunk/configure
trunk/configure.in
trunk/docs/Makefile.in
trunk/docs/Rose/Makefile.in
trunk/docs/Rose/Tutorial/Makefile.in
trunk/exampleTranslators/AstCopyReplTester/Makefile.in
trunk/exampleTranslators/DOTGenerator/Makefile.in
trunk/exampleTranslators/Makefile.am
trunk/exampleTranslators/Makefile.in
trunk/exampleTranslators/PDFGenerator/Makefile.in
trunk/exampleTranslators/defaultTranslator/Makefile.in
trunk/exampleTranslators/documentedExamples/AstRewriteExamples/Makefile.in
trunk/exampleTranslators/documentedExamples/Makefile.in
trunk/exampleTranslators/documentedExamples/dataBaseExamples/Makefile.in
trunk/exampleTranslators/documentedExamples/simpleTranslatorExamples/Makefile.in
trunk/projects/BabelPreprocessor/Makefile.in
trunk/projects/BinaryCloneDetection/Makefile.am
trunk/projects/BinaryCloneDetection/Makefile.in
trunk/projects/BinaryContextLookup/Makefile.in
trunk/projects/C_to_Promela/Makefile.in
trunk/projects/CloneDetection/Makefile.in
trunk/projects/DatalogAnalysis/Makefile.in
trunk/projects/DatalogAnalysis/relationTranslatorGenerator/Makefile.in
trunk/projects/DatalogAnalysis/src/DBFactories/Makefile.in
trunk/projects/DatalogAnalysis/src/Makefile.in
trunk/projects/DatalogAnalysis/tests/Makefile.in
trunk/projects/DistributedMemoryAnalysisCompass/Makefile.in
trunk/projects/DocumentationGenerator/Makefile.in
trunk/projects/FiniteStateModelChecker/Makefile.in
trunk/projects/MPICodeMotion/Makefile.in
trunk/projects/Makefile.in
trunk/projects/OpenMP_Translator/Makefile.in
trunk/projects/OpenMP_Translator/tests/Makefile.in
trunk/projects/OpenMP_Translator/tests/cvalidationsuite/Makefile.in
trunk/projects/OpenMP_Translator/tests/developmentTests/Makefile.in
trunk/projects/OpenMP_Translator/tests/epcc-c/Makefile.in
trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/BT/Makefile.in
trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/CG/Makefile.in
trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/EP/Makefile.in
trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/FT/Makefile.in
trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/IS/Makefile.in
trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/LU/Makefile.in
trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/MG/Makefile.in
trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/Makefile.in
trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/SP/Makefile.in
trunk/projects/UpcTranslation/Makefile.in
trunk/projects/UpcTranslation/tests/Makefile.in
trunk/projects/arrayOptimization/Makefile.in
trunk/projects/arrayOptimization/test/Makefile.in
trunk/projects/assemblyToSourceAst/Makefile.am
trunk/projects/assemblyToSourceAst/Makefile.in
trunk/projects/binCompass/Makefile.in
trunk/projects/binCompass/analyses/Makefile.in
trunk/projects/binCompass/graphanalyses/Makefile.in
trunk/projects/binaryVisualization/Makefile.in
trunk/projects/bugSeeding/Makefile.in
trunk/projects/checkPointExample/Makefile.in
trunk/projects/compass/Makefile.in
trunk/projects/compass/src/Makefile.in
trunk/projects/compass/src/compassSupport/Makefile.in
trunk/projects/compass/src/util/C-API/Makefile.in
trunk/projects/compass/src/util/MPIAbstraction/Makefile.in
trunk/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/Makefile.in
trunk/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/Makefile.in
trunk/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/include/Makefile.in
trunk/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/include/mpi2c++/Makefile.in
trunk/projects/compass/src/util/Makefile.in
trunk/projects/compass/tools/Makefile.in
trunk/projects/compass/tools/compass/Makefile.in
trunk/projects/compass/tools/compass/doc/Makefile.in
trunk/projects/compass/tools/compass/gui/Makefile.am
trunk/projects/compass/tools/compass/gui/Makefile.in
trunk/projects/compass/tools/compass/tests/C_tests/Makefile.in
trunk/projects/compass/tools/compass/tests/Cxx_tests/Makefile.in
trunk/projects/compass/tools/compass/tests/Makefile.in
trunk/projects/compass/tools/compassVerifier/Makefile.in
trunk/projects/compass/tools/sampleCompassSubset/Makefile.in
trunk/projects/dataStructureGraphing/Makefile.in
trunk/projects/highLevelGrammars/Makefile.in
trunk/projects/javaport/Makefile.in
trunk/projects/palette/Makefile.in
trunk/projects/programModeling/Makefile.in
trunk/projects/reverseComputation/Makefile.in
trunk/projects/runtimeErrorCheck/Makefile.in
trunk/projects/simpleCallGraphAnalysis/Makefile.in
trunk/rose_config.h.in
trunk/scripts/Makefile.in
trunk/src/3rdPartyLibraries/MSTL/Makefile.in
trunk/src/3rdPartyLibraries/Makefile.in
trunk/src/3rdPartyLibraries/antlr-jars/Makefile.in
trunk/src/3rdPartyLibraries/fortran-parser/Makefile.in
trunk/src/Makefile.in
trunk/src/ROSETTA/Makefile.in
trunk/src/ROSETTA/src/Makefile.am
trunk/src/ROSETTA/src/Makefile.in
trunk/src/backend/Makefile.in
trunk/src/backend/asmUnparser/Makefile.in
trunk/src/backend/unparser/CxxCodeGeneration/Makefile.in
trunk/src/backend/unparser/FortranCodeGeneration/Makefile.in
trunk/src/backend/unparser/Makefile.in
trunk/src/backend/unparser/PHPCodeGeneration/Makefile.in
trunk/src/backend/unparser/formatSupport/Makefile.in
trunk/src/backend/unparser/languageIndependenceSupport/Makefile.in
trunk/src/frontend/BinaryDisassembly/Makefile.in
trunk/src/frontend/CxxFrontend/Makefile.in
trunk/src/frontend/CxxFrontend/roseBinaryEDG-i686-pc-linux-gnu-2a1162d3a85dcf3ac377bd85dfed116c.tar.gz
trunk/src/frontend/Disassemblers/Makefile.in
trunk/src/frontend/ExecFormats/Makefile.in
trunk/src/frontend/Makefile.in
trunk/src/frontend/OpenFortranParser_SAGE_Connection/Makefile.in
trunk/src/frontend/PHPFrontend/Makefile.in
trunk/src/frontend/SageIII/Makefile.in
trunk/src/frontend/SageIII/astFileIO/Makefile.in
trunk/src/frontend/SageIII/astFixup/Makefile.in
trunk/src/frontend/SageIII/astHiddenTypeAndDeclarationLists/Makefile.in
trunk/src/frontend/SageIII/astMerge/Makefile.in
trunk/src/frontend/SageIII/astPostProcessing/Makefile.in
trunk/src/frontend/SageIII/astTokenStream/Makefile.in
trunk/src/frontend/SageIII/astVisualization/Makefile.in
trunk/src/frontend/SageIII/sageInterface/Makefile.in
trunk/src/frontend/SageIII/sageSupport.C
trunk/src/frontend/SageIII/virtualCFG/Makefile.in
trunk/src/midend/Makefile.in
trunk/src/midend/astDiagnostics/Makefile.in
trunk/src/midend/astInlining/Makefile.in
trunk/src/midend/astOutlining/GenerateFunc.cc
trunk/src/midend/astOutlining/Makefile.in
trunk/src/midend/astProcessing/Makefile.in
trunk/src/midend/astQuery/Makefile.in
trunk/src/midend/astRewriteMechanism/Makefile.in
trunk/src/midend/astUtil/Makefile.in
trunk/src/midend/astUtil/annotation/Makefile.in
trunk/src/midend/astUtil/astInterface/Makefile.in
trunk/src/midend/astUtil/astSupport/Makefile.in
trunk/src/midend/astUtil/symbolicVal/Makefile.in
trunk/src/midend/loopProcessing/Makefile.in
trunk/src/midend/loopProcessing/computation/Makefile.in
trunk/src/midend/loopProcessing/depGraph/Makefile.in
trunk/src/midend/loopProcessing/depInfo/Makefile.in
trunk/src/midend/loopProcessing/driver/Makefile.in
trunk/src/midend/loopProcessing/prepostTransformation/Makefile.in
trunk/src/midend/loopProcessing/slicing/Makefile.in
trunk/src/midend/programAnalysis/CFG/Makefile.in
trunk/src/midend/programAnalysis/CallGraphAnalysis/Makefile.in
trunk/src/midend/programAnalysis/Makefile.in
trunk/src/midend/programAnalysis/OAWrap/Makefile.in
trunk/src/midend/programAnalysis/annotationLanguageParser/Makefile.in
trunk/src/midend/programAnalysis/dataflowAnalysis/Makefile.in
trunk/src/midend/programAnalysis/defUseAnalysis/Makefile.in
trunk/src/midend/programAnalysis/distributedMemoryAnalysis/Makefile.in
trunk/src/midend/programAnalysis/dominanceAnalysis/Makefile.in
trunk/src/midend/programAnalysis/pointerAnal/Makefile.in
trunk/src/midend/programAnalysis/sideEffectAnalysis/Makefile.in
trunk/src/midend/programAnalysis/staticInterproceduralSlicing/Makefile.in
trunk/src/midend/programAnalysis/valuePropagation/Makefile.in
trunk/src/midend/programTransformation/Makefile.in
trunk/src/midend/programTransformation/constantFolding/Makefile.in
trunk/src/midend/programTransformation/finiteDifferencing/Makefile.in
trunk/src/midend/programTransformation/functionCallNormalization/Makefile.in
trunk/src/midend/programTransformation/implicitCodeGeneration/Makefile.in
trunk/src/midend/programTransformation/partialRedundancyElimination/Makefile.in
trunk/src/midend/programTransformation/runtimeTransformation/Makefile.in
trunk/src/roseExtensions/Makefile.in
trunk/src/roseExtensions/SQLiteConnection/Makefile.in
trunk/src/roseExtensions/dataStructureTraversal/Makefile.in
trunk/src/roseExtensions/databaseConnection/Makefile.in
trunk/src/roseExtensions/highLevelGrammar/Makefile.in
trunk/src/roseExtensions/roseHPCToolkit/Makefile.in
trunk/src/roseExtensions/roseHPCToolkit/docs/Makefile.in
trunk/src/roseExtensions/roseHPCToolkit/include/Makefile.in
trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/Makefile.in
trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/profir/Makefile.in
trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/profir2sage/Makefile.in
trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/sage/Makefile.in
trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/util/Makefile.in
trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/xml-xercesc/Makefile.in
trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/xml/Makefile.in
trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/xml2profir/Makefile.in
trunk/src/roseExtensions/roseHPCToolkit/src/Makefile.in
trunk/src/roseExtensions/roseHPCToolkit/src/profir/Makefile.in
trunk/src/roseExtensions/roseHPCToolkit/src/profir2sage/Makefile.in
trunk/src/roseExtensions/roseHPCToolkit/src/sage/Makefile.in
trunk/src/roseExtensions/roseHPCToolkit/src/util/Makefile.in
trunk/src/roseExtensions/roseHPCToolkit/src/xml-xercesc/Makefile.in
trunk/src/roseExtensions/roseHPCToolkit/src/xml/Makefile.in
trunk/src/roseExtensions/roseHPCToolkit/src/xml2profir/Makefile.in
trunk/src/roseExtensions/sqlite3x/Makefile.in
trunk/src/roseIndependentSupport/Makefile.am
trunk/src/roseIndependentSupport/Makefile.in
trunk/src/roseIndependentSupport/dot2gml/Makefile.in
trunk/src/roseSupport/Makefile.in
trunk/src/util/Makefile.in
trunk/src/util/commandlineProcessing/Makefile.in
trunk/src/util/graphs/Makefile.in
trunk/src/util/stringSupport/Makefile.in
trunk/src/util/support/Makefile.in
trunk/tests/CompileTests/A++Code/Makefile.in
trunk/tests/CompileTests/A++Tests/Makefile.in
trunk/tests/CompileTests/C99_tests/Makefile.in
trunk/tests/CompileTests/C_subset_of_Cxx_tests/Makefile.in
trunk/tests/CompileTests/C_tests/Makefile.in
trunk/tests/CompileTests/Cxx_tests/Makefile.in
trunk/tests/CompileTests/ElsaTestCases/Makefile.in
trunk/tests/CompileTests/ElsaTestCases/ctests/Makefile.in
trunk/tests/CompileTests/ElsaTestCases/gnu/Makefile.in
trunk/tests/CompileTests/ElsaTestCases/kandr/Makefile.in
trunk/tests/CompileTests/ElsaTestCases/std/Makefile.in
trunk/tests/CompileTests/ExpressionTemplateExample_tests/Makefile.in
trunk/tests/CompileTests/Fortran_tests/Makefile.in
trunk/tests/CompileTests/Makefile.in
trunk/tests/CompileTests/OpenMP_C_tests/Makefile.in
trunk/tests/CompileTests/OvertureCode/Makefile.in
trunk/tests/CompileTests/P++Tests/Makefile.in
trunk/tests/CompileTests/PythonExample_tests/Makefile.in
trunk/tests/CompileTests/RoseExample_tests/Makefile.in
trunk/tests/CompileTests/UPC_tests/Makefile.in
trunk/tests/CompileTests/boost_tests/Makefile.in
trunk/tests/CompileTests/colorAST_tests/Makefile.in
trunk/tests/CompileTests/copyAST_tests/Makefile.in
trunk/tests/CompileTests/hiddenTypeAndDeclarationListTests/Makefile.in
trunk/tests/CompileTests/mergeAST_tests/Makefile.in
trunk/tests/CompileTests/sourcePosition_tests/Makefile.in
trunk/tests/CompileTests/uninitializedField_tests/Makefile.in
trunk/tests/CompileTests/unparseToString_tests/Makefile.in
trunk/tests/CompileTests/virtualCFG_tests/Makefile.in
trunk/tests/CompilerOptionsTests/Makefile.in
trunk/tests/CompilerOptionsTests/testCpreprocessorOption/Makefile.in
trunk/tests/CompilerOptionsTests/testFileNamesAndExtensions/Makefile.in
trunk/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/Makefile.in
trunk/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseInsensitive/Makefile.in
trunk/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseSensitive/Makefile.in
trunk/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileNames/Makefile.in
trunk/tests/CompilerOptionsTests/testForSpuriousOutput/Makefile.in
trunk/tests/CompilerOptionsTests/testHeaderFileOutput/Makefile.in
trunk/tests/CompilerOptionsTests/testOutputFileOption/Makefile.in
trunk/tests/Makefile.in
trunk/tests/PerformanceTests/Makefile.in
trunk/tests/RunTests/A++Tests/Makefile.in
trunk/tests/RunTests/Makefile.in
trunk/tests/roseTests/Makefile.in
trunk/tests/roseTests/PHPTests/Makefile.in
trunk/tests/roseTests/astFileIOTests/Makefile.in
trunk/tests/roseTests/astInliningTests/Makefile.in
trunk/tests/roseTests/astInterfaceTests/Makefile.in
trunk/tests/roseTests/astMergeTests/Makefile.in
trunk/tests/roseTests/astOutliningTests/Makefile.am
trunk/tests/roseTests/astOutliningTests/Makefile.in
trunk/tests/roseTests/astOutliningTests/fortranTests/Makefile.in
trunk/tests/roseTests/astOutliningTests/outline.cc
trunk/tests/roseTests/astPerformanceTests/Makefile.in
trunk/tests/roseTests/astProcessingTests/Makefile.in
trunk/tests/roseTests/astQueryTests/Makefile.in
trunk/tests/roseTests/astRewriteTests/Makefile.in
trunk/tests/roseTests/astSymbolTableTests/Makefile.in
trunk/tests/roseTests/binaryTests/Makefile.in
trunk/tests/roseTests/loopProcessingTests/Makefile.in
trunk/tests/roseTests/programAnalysisTests/Makefile.in
trunk/tests/roseTests/programAnalysisTests/defUseAnalysisTests/Makefile.in
trunk/tests/roseTests/programAnalysisTests/sideEffectAnalysisTests/Makefile.in
trunk/tests/roseTests/programAnalysisTests/staticInterproceduralSlicingTests/Makefile.in
trunk/tests/roseTests/programAnalysisTests/testCallGraphAnalysis/Makefile.in
trunk/tests/roseTests/programTransformationTests/Makefile.in
trunk/tests/roseTests/roseHPCToolkitTests/Makefile.in
trunk/tests/roseTests/roseHPCToolkitTests/data/01/ANALYSIS/Makefile.in
trunk/tests/roseTests/roseHPCToolkitTests/data/01/Makefile.in
trunk/tests/roseTests/roseHPCToolkitTests/data/01/PROFILE/Makefile.in
trunk/tests/roseTests/roseHPCToolkitTests/data/01/PROGRAM/Makefile.in
trunk/tests/roseTests/roseHPCToolkitTests/data/02/Makefile.in
trunk/tests/roseTests/roseHPCToolkitTests/data/02/PROFILE/Makefile.in
trunk/tests/roseTests/roseHPCToolkitTests/data/02/struct_ls/Makefile.in
trunk/tests/roseTests/roseHPCToolkitTests/data/03/Makefile.in
trunk/tests/roseTests/roseHPCToolkitTests/data/03/PROFILE/Makefile.in
trunk/tests/roseTests/roseHPCToolkitTests/data/03/struct_ls/Makefile.in
trunk/tests/roseTests/roseHPCToolkitTests/data/Makefile.in
trunk/tests/roseTests/utilTests/Makefile.in
trunk/tests/translatorTests/Makefile.in
trunk/tools/Makefile.in
trunk/tutorial/Makefile.in
trunk/tutorial/database/Makefile.in
trunk/tutorial/outliner/Makefile.in
trunk/tutorial/roseHPCT/Makefile.in
Log:
Load rose-0.9.3a-1976 into trunk.
Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -109,7 +109,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -126,6 +125,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -201,7 +201,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -252,8 +251,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -271,8 +268,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -283,8 +278,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -313,13 +306,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -364,6 +353,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -387,8 +378,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -435,8 +424,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -478,14 +465,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -497,32 +484,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -588,6 +576,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -633,10 +622,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/aclocal.m4
===================================================================
--- trunk/aclocal.m4 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/aclocal.m4 2008-09-12 20:14:11 UTC (rev 32)
@@ -1111,7 +1111,6 @@
m4_include([config/enable-rosehpct.m4])
m4_include([config/generate-backend-compiler-specific-headers.m4])
m4_include([config/mdl_have_opengl.m4])
-m4_include([config/qrose.m4])
m4_include([config/qrose_indigo_1.m4])
m4_include([config/qrose_indigo_1_windows.m4])
m4_include([config/support-bddbddb.m4])
@@ -1128,5 +1127,6 @@
m4_include([config/support-purify.m4])
m4_include([config/support-python.m4])
m4_include([config/support-visualization.m4])
+m4_include([config/support-windows.m4])
m4_include([config/support-yices.m4])
m4_include([config/swig_enable_cxx.m4])
Modified: trunk/config/Makefile.for.ROSE.includes.and.libs
===================================================================
--- trunk/config/Makefile.for.ROSE.includes.and.libs 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/config/Makefile.for.ROSE.includes.and.libs 2008-09-12 20:14:11 UTC (rev 32)
@@ -40,7 +40,7 @@
ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@@ -50,7 +50,7 @@
ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
ROSE_DATABASE_LIB_NAME = rosedatabase
- ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@@ -66,7 +66,7 @@
SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
endif
@@ -79,20 +79,25 @@
# Conditional support for Gabriel's QRose GUI Library
if ROSE_USE_QROSE
-ROSE_GUI_INCLUDE = \
- -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- $(QT_INCLUDES)
+ ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
endif
+if ROSE_USE_QT
+ ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
+endif
+
# ROSE-HPCToolkit module
if ROSE_BUILD_ROSEHPCT
ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
ROSE_ROSEHPCT_LIBS = -lrosehpct
ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
endif
# ROSE-YICES Package (destributed by SRI as a static library)
@@ -100,7 +105,7 @@
ROSE_YICES_INCLUDES = -I$(yices_path)/include
ROSE_YICES_LIBS = -lyices
ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
endif
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@@ -173,6 +178,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -218,10 +224,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
# development. The use of the seperate libraries make the linking faster where the
Modified: trunk/config/Makefile.in
===================================================================
--- trunk/config/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/config/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -93,7 +93,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -110,6 +109,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -167,7 +167,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -218,8 +217,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -237,8 +234,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -249,8 +244,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -279,13 +272,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -330,6 +319,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -353,8 +344,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -401,8 +390,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -444,14 +431,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -463,32 +450,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -554,6 +542,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -599,10 +588,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Deleted: trunk/config/qrose.m4
===================================================================
--- trunk/config/qrose.m4 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/config/qrose.m4 2008-09-12 20:14:11 UTC (rev 32)
@@ -1,430 +0,0 @@
-AC_DEFUN([ROSE_SUPPORT_QROSE],
-[
-# Begin macro ROSE_SUPPORT_ QROSE.
-
-AC_ARG_WITH(QRose, [ --with-QRose=yes Specify if QRose is to be used (to build GUI Interfaces for ROSE Tools)])
-
-# Test if it is defined and if not then set it to be defined as "no"
-if test ! "$with_QRose" ; then
- with_QRose=no
-fi
-
-# echo "with_QRose = $with_QRose"
-
-# Only query for QT library if we are trying to build ROSE with QRose (Gabriel's GUI work)
-# Not clear if this is sufficently powerful of a serach mechanism to find teh required libraries.
-if (test "$with_QRose" = yes); then
-
-VAR_WIN32=0
-VAR_CYGWIN=0
-
-AC_PATH_X
-AC_PATH_QT
-AC_PATH_QT_MOC
-AC_PATH_GL
-
-AC_CHECK_LIB(png, png_create_write_struct,
- [LIB_IMAGES_LDFLAGS="${LIB_IMAGES_LDFLAGS} -lpng"
- AC_DEFINE(HAVE_LIBPNG, 1, [libpng present])
- PNG=true
- ])
-# AM_CONDITIONAL(PNG, test x$PNG = xtrue)
-
-AC_CHECK_LIB(jpeg, jpeg_std_error,
- [LIB_IMAGES_LDFLAGS="${LIB_IMAGES_LDFLAGS} -ljpeg"
- AC_DEFINE(HAVE_LIBJPEG, 1, [libjpeg present])
- JPEG=true
- ])
-# AM_CONDITIONAL(JPEG, test x$JPEG = xtrue)
-AC_SUBST(LIB_IMAGES_LDFLAGS)
-
-fi
-
-# Required to support QRose (internally)
-AM_CONDITIONAL(PNG, test x$PNG = xtrue)
-AM_CONDITIONAL(JPEG, test x$JPEG = xtrue)
-
-# Conditional to control use of QRose
-AM_CONDITIONAL(ROSE_USE_QROSE, test $with_QRose = yes)
-
-# End macro ROSE_SUPPORT_ QROSE.
-])
-
-dnl ------------------------------------------------------------------------
-dnl Find a file (or one of more files in a list of dirs)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_FIND_FILE],
-[
-$3=NO
-for i in $2;
-do
- for j in $1;
- do
- if test -r "$i/$j"; then
- $3=$i
- break 2
- fi
- done
-done
-])
-
-AC_DEFUN([FIND_PATH],
-[
- AC_MSG_CHECKING([for $1])
- AC_CACHE_VAL(kde_cv_path_$1,
- [
- kde_cv_path_$1="NONE"
- if test -n "$$2"; then
- kde_cv_path_$1="$$2";
- else
- dirs="$3"
- kde_save_IFS=$IFS
- IFS=':'
- for dir in $PATH; do
- dirs="$dirs $dir"
- done
- IFS=$kde_save_IFS
-
- for dir in $dirs; do
- if test -x "$dir/$1"; then
- if test -n "$5"
- then
- evalstr="$dir/$1 $5 2>&1 "
- if eval $evalstr; then
- kde_cv_path_$1="$dir/$1"
- break
- fi
- else
- kde_cv_path_$1="$dir/$1"
- break
- fi
- fi
- done
-
- fi
-
- ])
-
- if test -z "$kde_cv_path_$1" || test "$kde_cv_path_$1" = "NONE"; then
- AC_MSG_RESULT(not found)
- $4
- else
- AC_MSG_RESULT($kde_cv_path_$1)
- $2=$kde_cv_path_$1
- fi
-])
-
-
-
-dnl ------------------------------------------------------------------------
-dnl Try to find the Open GL headers and libraries.
-dnl $(GL_LDFLAGS) will be -Lglliblocation (if needed)
-dnl and $(GL_INCLUDES) will be -Iglheaderlocation (if needed)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_PATH_GL],
-[
-AC_REQUIRE([AC_PATH_X])
-if test ${VAR_WIN32} = 1
-then
-LIB_GL="-lglu32 -lopengl32"
-else
-LIB_GL="-lGLU -lGL -lXi -lXmu"
-fi
-AC_MSG_CHECKING([for Open Gl])
-
-ac_gl_includes="" ac_gl_libraries=""
-
-AC_ARG_WITH(gl-includes,
- [ --with-gl-includes=DIR where the OpenGL includes are. ],
- [ ac_gl_includes="$withval"
- ])
-
-AC_ARG_WITH(gl-libraries,
- [ --with-gl-libraries=DIR where the OpenGL libraries are. ],
- [ ac_gl_libraries="$withval"
- ])
-
-AC_CACHE_VAL(ac_cv_have_gl,
-[
-if test ${VAR_WIN32} = 1
-then
-gl_incdirs=" /mingw/include $ac_gl_includes $GLDIR/include /usr/include /usr/X11R6/include/X11 /usr/X11R6/include $x_includes "
-else
-gl_incdirs=" $ac_gl_includes $GLDIR/include /usr/include /usr/X11R6/include/X11 /usr/X11R6/include $x_includes "
-fi
-AC_FIND_FILE(GL/gl.h, $gl_incdirs, gl_incdir)
-ac_gl_includes="$gl_incdir"
-
-if test ${VAR_WIN32} = 1
-then
-gl_libdirs="$GLDIR $ac_gl_libraries $GLLIB /usr/X11R6/lib /usr/lib /usr/local/lib $x_libraries "
-else
-gl_libdirs="$ac_gl_libraries $GLLIB /usr/X11R6/lib /usr/lib /usr/local/lib $x_libraries "
-fi
-
-test -n "$GLDIR" && gl_libdirs="$GLDIR/lib $GLDIR $gl_libdirs"
-test=NONE
-gl_libdir=NONE
-for dir in $gl_libdirs; do
-if test ${VAR_WIN32} = 1
-then
- try="ls -1 $dir/*opengl*"
-else
- try="ls -1 $dir/libGL*"
-fi
- if test=`eval $try 2> /dev/null`; then gl_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
-done
-ac_gl_libraries="$gl_libdir"
-
- GL_INCLUDES="-I$ac_gl_includes"
- GL_LDFLAGS="-L$ac_gl_libraries"
-])
-
-eval "$ac_cv_have_gl"
-if test "$ac_gl_libraries" = NONE; then
- AC_MSG_ERROR([ Not found , put your GLDIR environnement variable to the OpenGL directory ]);
-else
- ac_cv_have_gl="have_gl=yes \
- ac_gl_includes=$ac_gl_includes ac_gl_libraries=$ac_gl_libraries"
- AC_MSG_RESULT([ libraries $ac_gl_libraries, headers $ac_gl_includes ])
- gl_libraries="$ac_gl_libraries"
- gl_includes="$ac_gl_includes"
- GL_INCLUDES="-I$ac_gl_includes"
- GL_LDFLAGS="-L$ac_gl_libraries"
-fi
-
-AC_SUBST(gl_libraries)
-AC_SUBST(gl_includes)
-AC_SUBST(GL_INCLUDES)
-AC_SUBST(GL_LDFLAGS)
-
-if test ${VAR_WIN32} = 1
-then
-LIB_GL="-lglu32 -lopengl32"
-else
-LIB_GL="-lGLU -lGL -lXi -lXmu"
-fi
-AC_SUBST(LIB_GL)
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Try to find ROSE headers and libraries.
-dnl $(ROSE_LDFLAGS) will be -Lrose_lib_location (if needed)
-dnl and $(ROSE_INCLUDES) will be -Irose_header_location (if needed)
-dnl ------------------------------------------------------------------------
-
-AC_DEFUN([AC_PATH_ROSE],
-[
- LIB_ROSE="-lrose -ledg"
- AC_MSG_CHECKING([for ROSE])
-
- ac_rose_includes=NO ac_rose_libraries=NO
- AC_ARG_WITH(rose-includes,
- [ --with-rose-includes=DIR where the ROSE includes are. ],
- [ ac_rose_includes="$withval" ]
- )
-
- AC_ARG_WITH(rose-libraries,
- [ --with-rose-libraries=DIR where the ROSE libraries are. ],
- [ ac_rose_libraries="$withval" ]
- )
-
- AC_CACHE_VAL(ac_cv_have_rose,
- [
- rose_incdirs="$ac_rose_includes $ROSEDIR/include /usr/local/include"
- AC_FIND_FILE(rose.h, $rose_incdirs, rose_incdir)
- ac_rose_includes="$rose_incdir"
-
- rose_libdirs="$ac_rose_libraries $ROSEDIR/lib /usr/local/lib"
- rose_libdirs="$ac_rose_libraries $rose_libdirs"
- test=NONE
- rose_libdir=NONE
- for dir in $rose_libdirs; do
- try="ls -1 $dir/librose*"
- if test=`eval $try 2> /dev/null`; then rose_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
- done
- ac_rose_libraries="$rose_libdir"
-
- rose_libraries="$ac_rose_libraries"
- rose_includes="$ac_rose_includes"
- ROSE_INCLUDES="-I$ac_rose_includes"
- ROSE_LDFLAGS="-L$ac_rose_libraries"
- ])
-
- eval "$ac_cv_have_rose"
- if test "$ac_rose_libraries" = NONE; then
- AC_MSG_ERROR([ not found, put your ROSEDIR environnement variable to the ROSE directory ]);
- else
- ac_cv_have_rose="have_rose=yes \
- ac_rose_includes=$ac_rose_includes ac_rose_libraries=$ac_rose_libraries"
- AC_MSG_RESULT([ libraries $ac_rose_libraries, headers $ac_rose_includes ])
- rose_libraries="$ac_rose_libraries"
- rose_includes="$ac_rose_includes"
- ROSE_INCLUDES="-I$rose_includes"
- ROSE_LDFLAGS="-L$rose_libraries"
- fi
- AC_SUBST(rose_libraries)
- AC_SUBST(rose_includes)
- AC_SUBST(ROSE_INCLUDES)
- AC_SUBST(ROSE_LDFLAGS)
- AC_SUBST(LIB_ROSE)
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Try to find the QT headers and libraries.
-dnl $(QT_LDFLAGS) will be -Lqt_lib_location (if needed)
-dnl and $(QT_INCLUDES) will be -Iqt_header_location (if needed)
-dnl ------------------------------------------------------------------------
-AC_DEFUN([AC_PATH_QT],
-[
-LIB_QT="-lqt-mt"
-AC_MSG_CHECKING([for QT])
-
-ac_qt_includes=NO ac_qt_libraries=NO
-
-AC_ARG_WITH(qt-includes,
- [ --with-qt-includes=DIR where the QT includes are. ],
- [ ac_qt_includes="$withval"
- ])
-
-AC_ARG_WITH(qt-libraries,
- [ --with-qt-libraries=DIR where the QT libraries are. ],
- [ ac_qt_libraries="$withval"
- ])
-
-AC_CACHE_VAL(ac_cv_have_qt,
-[
-qt_incdirs="$ac_qt_includes $QTDIR/include $QTDIR/include/qt /usr/include/qt /usr/lib/qt/include /usr/local/qt/include /usr/include /usr/local/lib/qt/include "
-AC_FIND_FILE(qgl.h, $qt_incdirs, qt_incdir)
-ac_qt_includes="$qt_incdir"
-
-qt_libdirs="$ac_qt_libraries $QTDIR/lib /usr/lib/qt/lib /usr/local/lib/qt/lib /usr/lib/ /usr/local/lib/"
-test -n "$QTDIR" && qt_libdirs="$QTDIR/lib $QTDIR $qt_libdirs"
-if test ! "$ac_qt_libraries" = "NO"; then
- qt_libdirs="$ac_qt_libraries $qt_libdirs"
-fi
-test=NONE
-qt_libdir=NONE
-for dir in $qt_libdirs; do
- try="ls -1 $dir/libqt-mt.so.3.3*"
- if test=`eval $try 2> /dev/null`; then qt_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
-done
-ac_qt_libraries="$qt_libdir"
-
- qt_libraries="$ac_qt_libraries"
- qt_includes="$ac_qt_includes"
- QT_INCLUDES="-I$ac_qt_includes"
- QT_LDFLAGS="-L$ac_qt_libraries"
-])
-
-eval "$ac_cv_have_qt"
-if test "$ac_qt_libraries" = NONE; then
- AC_MSG_ERROR([ not found, put your QTDIR environnement variable to the QT directory (qt-mt version > 3.3 required) ]);
-else
- ac_cv_have_qt="have_qt=yes \
- ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
- AC_MSG_RESULT([ libraries $ac_qt_libraries, headers $ac_qt_includes ])
- qt_libraries="$ac_qt_libraries"
- qt_includes="$ac_qt_includes"
- QT_INCLUDES="-I$qt_includes"
- QT_LDFLAGS="-L$qt_libraries"
-fi
-AC_SUBST(qt_libraries)
-AC_SUBST(qt_includes)
-AC_SUBST(QT_INCLUDES)
-AC_SUBST(QT_LDFLAGS)
-AC_SUBST(LIB_QT)
-])
-
-AC_DEFUN([MOC_ERROR_MESSAGE],
-[
- AC_MSG_ERROR([No Qt meta object compiler (moc) found!
-Please check whether you installed Qt correctly.
-You need to have a running moc binary.
-configure tried to run $ac_cv_path_moc and the test didn't
-succeed. If configure shouldn't have tried this one, set
-the environment variable MOC to the right one before running
-configure.
-])
-])
-
-AC_DEFUN([UIC_ERROR_MESSAGE],
-[
- AC_MSG_ERROR([No Qt user interface compiler (uic) found!
-Please check whether you installed Qt correctly.
-You need to have a running uic binary.
-configure tried to run $ac_cv_path_uic and the test didn't
-succeed. If configure shouldn't have tried this one, set
-the environment variable UIC to the right one before running
-configure.
-])
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Find the meta object compiler in the PATH, in $QTDIR/bin, and some
-dnl more usual places
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_PATH_QT_MOC],
-[
- FIND_PATH(moc, MOC, [$ac_qt_bindir $QTDIR/bin $QTDIR/src/moc \
- /usr/bin /usr/X11R6/bin /usr/lib/qt/bin \
- /usr/local/qt/bin], [MOC_ERROR_MESSAGE])
-
- if test -z "$MOC"; then
- if test -n "$ac_cv_path_moc"; then
- output=`eval "$ac_cv_path_moc --help 2>&1 | sed -e '1q' | grep Qt"`
- fi
- echo "configure:__oline__: tried to call $ac_cv_path_moc --help 2>&1 | sed -e '1q' | grep Qt" >&AC_FD_CC
- echo "configure:__oline__: moc output: $output" >&AC_FD_CC
-
- if test -z "$output"; then
- MOC_ERROR_MESSAGE
- fi
- fi
-
- AC_SUBST(MOC)
-])
-
-AC_DEFUN([AC_PATH_QT_UIC],
-[
- FIND_PATH(uic, UIC, [$ac_qt_bindir $QTDIR/bin $QTDIR/src/uic \
- /usr/bin /usr/X11R6/bin /usr/lib/qt/bin \
- /usr/local/qt/bin], [UIC_ERROR_MESSAGE])
-
- if test -z "$UIC"; then
- if test -n "$ac_cv_path_uic"; then
- output=`eval "$ac_cv_path_uic --help 2>&1 | sed -e '1q' | grep Qt"`
- fi
- echo "configure:__oline__: tried to call $ac_cv_path_uic --help 2>&1 | sed -e '1q' | grep Qt" >&AC_FD_CC
- echo "configure:__oline__: uic output: $output" >&AC_FD_CC
-
- if test -z "$output"; then
- UIC_ERROR_MESSAGE
- fi
- fi
-
- AC_SUBST(UIC)
-])
-
-AC_DEFUN([AC_PATH_MINGW],
-[
-AC_MSG_CHECKING(for MinGW)
-
-libraries="iconv.dll zlib1.dll freetype*.dll libxml*.dll libjpeg*.dll libpng*.dll mgwz.dll mingwm*.dll"
-for lib in $libraries; do
-try="ls -1 ${MINGWDIR}/bin/$lib"
-if !(test=`eval $try 2> /dev/null`)
-then
-AC_MSG_ERROR([Libraries was not found. Put your MINGWDIR environnement variable to the MinGW directory and install : libpng, libjpeg, iconv, zlib, freetype and xml2 libraries ])
-fi
-done
-MINDIR=${MINGWDIR}
-AC_SUBST(MINDIR)
-])
-
Modified: trunk/config/qrose_indigo_1.m4
===================================================================
--- trunk/config/qrose_indigo_1.m4 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/config/qrose_indigo_1.m4 2008-09-12 20:14:11 UTC (rev 32)
@@ -78,10 +78,11 @@
[
AC_MSG_CHECKING([for Qt])
+dnl DQ (9/11/2008): Modified to set the "n" so that tests without QT would work.
AC_ARG_WITH(qt,
[ --with-qt=DIR where the QT root directory is. ],
- [ ac_qt_path="$withval"
- ])
+ [ ac_qt_path="$withval"],
+ [ with_qt=no ])
AC_ARG_WITH(qt-inc,
[ --with-qt-inc=DIR where the QT includes are. ],
@@ -96,7 +97,7 @@
dnl ---------------------------[check Qt headers]------------
qt_incdirs="$ac_qt_includes $ac_qt_path/include /usr/include/qt4"
AC_FIND_FILE(QtGui/qapplication.h, $qt_incdirs, qt_incdir)
- if test "$with_QRose" != no && test "$qt_incdir" = NONE; then
+ if test "x$with_QRose" != xno && test "$qt_incdir" = NONE; then
AC_MSG_ERROR([ Qt headers not found, use --with-qt=DIR or --with-qt-includes=DIR])
fi
QT_INCLUDES="-I$qt_incdir/QtCore -I$qt_incdir/QtGui -I$qt_incdir"
Modified: trunk/config/support-binary-analysis.m4
===================================================================
--- trunk/config/support-binary-analysis.m4 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/config/support-binary-analysis.m4 2008-09-12 20:14:11 UTC (rev 32)
@@ -20,33 +20,3 @@
]
)
-
-AC_DEFUN([ROSE_SUPPORT_WINDOWS_ANALYSIS],
-[
-# Begin macro ROSE_SUPPORT_WINDOWS_ANALYSIS.
-
-AC_MSG_CHECKING(for Wine -- Wine is not an emulator)
-AC_ARG_WITH(wine,
-[ --with-wine=PATH Specify the prefix where Wine is installed],
-,
-if test ! "$with_wine" ; then
- with_wine=no
-fi
-)
-
-echo "In ROSE SUPPORT MACRO: with_wine $with_wine"
-
-if test "$with_wine" = no; then
- # If wine is not specified, then don't use it.
- echo "Skipping use of Wine for Windows Binary Analysis!"
-else
- wine_path=$with_wine
- echo "Setup Wine support in ROSE! path = $wine_path"
- AC_DEFINE([USE_ROSE_WINDOWS_ANALYSIS_SUPPORT],1,[Wine provides access to Windows specific binary file format headers.])
-fi
-
-AC_SUBST(wine_path)
-
-# End macro ROSE_SUPPORT_WINDOWS_BINARY_ANALYSIS.
-]
-)
Added: trunk/config/support-windows.m4
===================================================================
--- trunk/config/support-windows.m4 (rev 0)
+++ trunk/config/support-windows.m4 2008-09-12 20:14:11 UTC (rev 32)
@@ -0,0 +1,29 @@
+AC_DEFUN([ROSE_SUPPORT_WINDOWS_ANALYSIS],
+[
+# Begin macro ROSE_SUPPORT_WINDOWS_ANALYSIS.
+
+AC_MSG_CHECKING(for Wine -- Wine is not an emulator)
+AC_ARG_WITH(wine,
+[ --with-wine=PATH Specify the prefix where Wine is installed],
+,
+if test ! "$with_wine" ; then
+ with_wine=no
+fi
+)
+
+echo "In ROSE SUPPORT MACRO: with_wine $with_wine"
+
+if test "$with_wine" = no; then
+ # If wine is not specified, then don't use it.
+ echo "Skipping use of Wine for Windows Binary Analysis!"
+else
+ wine_path=$with_wine
+ echo "Setup Wine support in ROSE! path = $wine_path"
+ AC_DEFINE([USE_ROSE_WINDOWS_ANALYSIS_SUPPORT],1,[Wine provides access to Windows header files for analysis of windows applications under Linux.])
+fi
+
+AC_SUBST(wine_path)
+
+# End macro ROSE_SUPPORT_WINDOWS_BINARY_ANALYSIS.
+]
+)
Modified: trunk/configure
===================================================================
--- trunk/configure 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/configure 2008-09-12 20:14:11 UTC (rev 32)
@@ -465,7 +465,7 @@
ac_subdirs_all="$ac_subdirs_all Projects/DataBase"
ac_subdirs_all="$ac_subdirs_all src/3rdPartyLibraries/libltdl src/3rdPartyLibraries/libharu-2.1.0"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar configure_date ROSE_USE_QROSE_TRUE ROSE_USE_QROSE_FALSE DOT_TO_GML_TRANSLATOR_TRUE DOT_TO_GML_TRANSLATOR_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os ROSE_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP QT_INCLUDES QT_LDFLAGS USING_WINDOWS QROSE_USE_MINGW32_TRUE QROSE_USE_MINGW32_FALSE QROSE_USE_WINDOWS_TRUE QROSE_USE_WINDOWS_FALSE MOC gl_libraries gl_includes GL_INCLUDES GL_LDFLAGS LIB_GL LIB_IMAGES_LDFLAGS PNG_TRUE PNG_FALSE JPEG_TRUE JPEG_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE BOOST_CPPFLAGS BOOST_LDFLAGS ac_boost_path BOOST_THREAD_LIB BOOST_DATE_TIME_LIB BOOST_REGEX_LIB BOOST_PROGRAM_OPTIONS_LIB BOOST_SERIALIZATION_LIB BOOST_SYSTEM_LIB BOOST_FILESYSTEM_LIB ROSE_USE_BOOST_WAVE_TRUE ROSE_USE_BOOST_WAVE_FALSE BOOST_WAVE_LIB SQLITE3_CFLAGS SQLITE3_LDFLAGS SQLITE3_VERSION MYSQL_CONFIG MYSQL_VERSION MYSQL_CFLAGS MYSQL_LDFLAGS ROSE_USE_LONG_MAKE_CHECK_RULE_TRUE ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE XML2_CONFIG XML_CPPFLAGS XML_LIBS ROSE_USE_XML_TRUE ROSE_USE_XML_FALSE ROSE_OBJDUMP_PATH ac_ct_ROSE_OBJDUMP_PATH ROSE_USE_OBJDUMP_TRUE ROSE_USE_OBJDUMP_FALSE ROSE_USE_BINARYCONTEXTLOOKUP_TRUE ROSE_USE_BINARYCONTEXTLOOKUP_FALSE CXXCPP EGREP VALGRIND_BINARY USE_VALGRIND_TRUE USE_VALGRIND_FALSE USE_BINARY_ANALYSIS_TESTS_TRUE USE_BINARY_ANALYSIS_TESTS_FALSE L!
EX LEXLI
B LEX_OUTPUT_ROOT subdirs optional_DataBase_subdirs MySQL_login_string MySQL_path MySQL_server MySQL_username MySQL_password MySQL_database_name ROSE_USE_MYSQL_DATABASE_TRUE ROSE_USE_MYSQL_DATABASE_FALSE ROSE_USE_SQLITE_DATABASE_TRUE ROSE_USE_SQLITE_DATABASE_FALSE maple_path ROSE_USE_MAPLE_TRUE ROSE_USE_MAPLE_FALSE yices_path ROSE_USE_YICES_TRUE ROSE_USE_YICES_FALSE php_path ROSE_USE_PHP_TRUE ROSE_USE_PHP_FALSE ROSE_USE_BINARY_SQL_TRUE ROSE_USE_BINARY_SQL_FALSE wine_path ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_FALSE edg_union_struct_debugging_value omp_runtime_support_path ROSE_USE_OPENMP_TRUE ROSE_USE_OPENMP_FALSE gcc_omp_path ROSE_USE_GCC_OMP_TRUE ROSE_USE_GCC_OMP_FALSE ROSE_MPI_TRUE ROSE_MPI_FALSE MPICXX ac_ct_MPICXX X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GL_CFLAGS GL_LIBS ROSE_USE_OPENGL_TRUE ROSE_USE_OPENGL_FALSE python_path PERL CLASSPATH JAVA_PATH JAVA_JVM_LINK JAVA_JVM_INCLUDE JAVA JAVAC JAR OPEN_FORTRAN_PARSER_PATH GFORTRAN_PATH ROSE_USE_OPEN_FORTRAN_PARSER_TRUE ROSE_USE_OPEN_FORTRAN_PARSER_FALSE SWIG SWIG_LIB ENABLE_JAVAPORT_TRUE ENABLE_JAVAPORT_FALSE bddbddb_path ROSE_USE_BDDBDDB_TRUE ROSE_USE_BDDBDDB_FALSE optional_Visualization_subdirs FLTK_include_path FLTK_libs_path GraphViz_include_path GraphViz_libs_path GLUT_include_path GLUT_libs_path ROSE_USE_VISUALIZATION_TRUE ROSE_USE_VISUALIZATION_FALSE DOXYGEN_EXTRACT_ALL DOXYGEN_EXTRACT_PRIVATE DOXYGEN_EXTRACT_STATIC DOXYGEN_INTERNAL_DOCS DOXYGEN_HIDE_UNDOC_MEMBERS DOXYGEN_HIDE_UNDOC_CLASSES DOXYGEN_HIDE_FRIEND_COMPOUNDS DOXYGEN_ENABLED_SECTIONS DOXYGEN_ADDED_DIRECTORY_1 DOXYGEN_ADDED_DIRECTORY_2 DOXYGEN_USE_TAG_FILE LTDLINCL LIBLTDL INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL USE_ROSE_IN_BUILD_TREE_VAR_TRUE USE_ROSE_IN_BUILD_TREE_VAR_FALSE CXX_DEBUG CXX_OPTIMIZE CXX_WARNINGS CXX_TEMPLATE_REPOSITORY_PATH CXX_TEMPLATE_OBJECTS purify_PREFIX purify_INCLUDES purify_LIBS purify_BIN PURIFY_OPTIONS AUX_!
LINKER C
CLD CXXLD insure_PREFIX insure_INCLUDES insure_LIBS insure_BIN INSURE_OPTIONS LIBS_WITH_RPATH Axx_INCLUDES Axx_LIBS Pxx_INCLUDES Pxx_LIBS AXXPXX_SPECIFIC_TESTS_TRUE AXXPXX_SPECIFIC_TESTS_FALSE USE_GCJ_TRUE USE_GCJ_FALSE RT_LIBS DQ_DEVELOPER_TESTS_TRUE DQ_DEVELOPER_TESTS_FALSE CXX_STATIC_LIB_UPDATE CXX_SHARED_LIB_UPDATE LIBOBJS OBJ EXE GEN_BE MD5 BINARY_EDG_TARBALL_ENABLED_TRUE BINARY_EDG_TARBALL_ENABLED_FALSE build_triplet_without_redhat EXPECTED_BINARY_EDG_DIRNAME top_pwd absolute_path_srcdir INCLUDE_COMPASS_MAKEFILE_INC ROSEHPCT_DEP_INCLUDES ROSEHPCT_DEP_LIBS ROSE_BUILD_ROSEHPCT_TRUE ROSE_BUILD_ROSEHPCT_FALSE QROSE_PREFIX USE_QROSE_TRUE USE_QROSE_FALSE QROSE_LDFLAGS QROSE_CXXFLAGS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar configure_date DOT_TO_GML_TRANSLATOR_TRUE DOT_TO_GML_TRANSLATOR_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os ROSE_HOME CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE BOOST_CPPFLAGS BOOST_LDFLAGS ac_boost_path CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE BOOST_THREAD_LIB BOOST_DATE_TIME_LIB BOOST_REGEX_LIB BOOST_PROGRAM_OPTIONS_LIB BOOST_SERIALIZATION_LIB BOOST_SYSTEM_LIB BOOST_FILESYSTEM_LIB ROSE_USE_BOOST_WAVE_TRUE ROSE_USE_BOOST_WAVE_FALSE BOOST_WAVE_LIB SQLITE3_CFLAGS SQLITE3_LDFLAGS SQLITE3_VERSION MYSQL_CONFIG MYSQL_VERSION MYSQL_CFLAGS MYSQL_LDFLAGS ROSE_USE_LONG_MAKE_CHECK_RULE_TRUE ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE XML2_CONFIG XML_CPPFLAGS XML_LIBS ROSE_USE_XML_TRUE ROSE_USE_XML_FALSE ROSE_OBJDUMP_PATH ac_ct_ROSE_OBJDUMP_PATH ROSE_USE_OBJDUMP_TRUE ROSE_USE_OBJDUMP_FALSE ROSE_USE_BINARYCONTEXTLOOKUP_TRUE ROSE_USE_BINARYCONTEXTLOOKUP_FALSE CXXCPP EGREP VALGRIND_BINARY USE_VALGRIND_TRUE USE_VALGRIND_FALSE USE_BINARY_ANALYSIS_TESTS_TRUE USE_BINARY_ANALYSIS_TESTS_FALSE LEX LEXLIB LEX_OUTPUT_ROOT subdirs optional_DataBase_subdirs MySQL_login_string MySQL_path MySQL_server MySQL_username MySQL_password MySQL_database_name ROSE_USE_MYSQL_DATABASE_TRUE ROSE_USE_MYSQL_DATABASE_FALSE ROSE_USE_SQLITE_DATABASE_TRUE ROSE_USE_SQLITE_DATABASE_FALSE maple_path ROSE_USE_M!
APLE_TRU
E ROSE_USE_MAPLE_FALSE yices_path ROSE_USE_YICES_TRUE ROSE_USE_YICES_FALSE php_path ROSE_USE_PHP_TRUE ROSE_USE_PHP_FALSE ROSE_USE_BINARY_SQL_TRUE ROSE_USE_BINARY_SQL_FALSE wine_path ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_FALSE edg_union_struct_debugging_value omp_runtime_support_path ROSE_USE_OPENMP_TRUE ROSE_USE_OPENMP_FALSE gcc_omp_path ROSE_USE_GCC_OMP_TRUE ROSE_USE_GCC_OMP_FALSE ROSE_MPI_TRUE ROSE_MPI_FALSE MPICXX ac_ct_MPICXX X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GL_CFLAGS GL_LIBS ROSE_USE_OPENGL_TRUE ROSE_USE_OPENGL_FALSE python_path PERL CLASSPATH JAVA_PATH JAVA_JVM_LINK JAVA_JVM_INCLUDE JAVA JAVAC JAR OPEN_FORTRAN_PARSER_PATH GFORTRAN_PATH ROSE_USE_OPEN_FORTRAN_PARSER_TRUE ROSE_USE_OPEN_FORTRAN_PARSER_FALSE SWIG SWIG_LIB ENABLE_JAVAPORT_TRUE ENABLE_JAVAPORT_FALSE bddbddb_path ROSE_USE_BDDBDDB_TRUE ROSE_USE_BDDBDDB_FALSE optional_Visualization_subdirs FLTK_include_path FLTK_libs_path GraphViz_include_path GraphViz_libs_path GLUT_include_path GLUT_libs_path ROSE_USE_VISUALIZATION_TRUE ROSE_USE_VISUALIZATION_FALSE DOXYGEN_EXTRACT_ALL DOXYGEN_EXTRACT_PRIVATE DOXYGEN_EXTRACT_STATIC DOXYGEN_INTERNAL_DOCS DOXYGEN_HIDE_UNDOC_MEMBERS DOXYGEN_HIDE_UNDOC_CLASSES DOXYGEN_HIDE_FRIEND_COMPOUNDS DOXYGEN_ENABLED_SECTIONS DOXYGEN_ADDED_DIRECTORY_1 DOXYGEN_ADDED_DIRECTORY_2 DOXYGEN_USE_TAG_FILE LTDLINCL LIBLTDL INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL USE_ROSE_IN_BUILD_TREE_VAR_TRUE USE_ROSE_IN_BUILD_TREE_VAR_FALSE CXX_DEBUG CXX_OPTIMIZE CXX_WARNINGS CXX_TEMPLATE_REPOSITORY_PATH CXX_TEMPLATE_OBJECTS purify_PREFIX purify_INCLUDES purify_LIBS purify_BIN PURIFY_OPTIONS AUX_LINKER CCLD CXXLD insure_PREFIX insure_INCLUDES insure_LIBS insure_BIN INSURE_OPTIONS LIBS_WITH_RPATH Axx_INCLUDES Axx_LIBS Pxx_INCLUDES Pxx_LIBS AXXPXX_SPECIFIC_TESTS_TRUE AXXPXX_SPECIFIC_TESTS_FALSE USE_GCJ_TRUE USE_GCJ_FALSE RT_LIBS DQ_DEVELOPER_TESTS_TRUE DQ_DEVELOPER_TESTS_FALSE CXX_STATI!
C_LIB_UP
DATE CXX_SHARED_LIB_UPDATE LIBOBJS OBJ EXE GEN_BE MD5 BINARY_EDG_TARBALL_ENABLED_TRUE BINARY_EDG_TARBALL_ENABLED_FALSE build_triplet_without_redhat EXPECTED_BINARY_EDG_DIRNAME top_pwd absolute_path_srcdir INCLUDE_COMPASS_MAKEFILE_INC ROSEHPCT_DEP_INCLUDES ROSEHPCT_DEP_LIBS ROSE_BUILD_ROSEHPCT_TRUE ROSE_BUILD_ROSEHPCT_FALSE QROSE_PREFIX ROSE_USE_QROSE_TRUE ROSE_USE_QROSE_FALSE QT_INCLUDES QT_LDFLAGS USING_WINDOWS QROSE_USE_MINGW32_TRUE QROSE_USE_MINGW32_FALSE QROSE_USE_WINDOWS_TRUE QROSE_USE_WINDOWS_FALSE MOC ROSE_USE_QT_TRUE ROSE_USE_QT_FALSE LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -906,26 +906,6 @@
ac_env_target_alias_value=$target_alias
ac_cv_env_target_alias_set=${target_alias+set}
ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
ac_env_CXX_set=${CXX+set}
ac_env_CXX_value=$CXX
ac_cv_env_CXX_set=${CXX+set}
@@ -934,6 +914,22 @@
ac_env_CXXFLAGS_value=$CXXFLAGS
ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
ac_cv_env_CXXFLAGS_value=$CXXFLAGS
+ac_env_LDFLAGS_set=${LDFLAGS+set}
+ac_env_LDFLAGS_value=$LDFLAGS
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ac_cv_env_LDFLAGS_value=$LDFLAGS
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_env_CPPFLAGS_value=$CPPFLAGS
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_CC_set=${CC+set}
+ac_env_CC_value=$CC
+ac_cv_env_CC_set=${CC+set}
+ac_cv_env_CC_value=$CC
+ac_env_CFLAGS_set=${CFLAGS+set}
+ac_env_CFLAGS_value=$CFLAGS
+ac_cv_env_CFLAGS_set=${CFLAGS+set}
+ac_cv_env_CFLAGS_value=$CFLAGS
ac_env_CXXCPP_set=${CXXCPP+set}
ac_env_CXXCPP_value=$CXXCPP
ac_cv_env_CXXCPP_set=${CXXCPP+set}
@@ -1071,14 +1067,6 @@
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-QRose=yes Specify if QRose is to be used (to build GUI Interfaces for ROSE Tools)
- --with-x use the X Window System
- --with-qt=DIR where the QT root directory is.
- --with-qt-inc=DIR where the QT includes are.
- --with-qt-lib=DIR where the QT libraries are.
- --with-qt-bin=DIR where the QT binaries are.
- --with-gl-includes=DIR where the OpenGL includes are.
- --with-gl-libraries=DIR where the OpenGL libraries are.
--with-boost[=DIR]
use boost (default is yes) - it is possible to
specify the root directory for boost (optional)
@@ -1149,6 +1137,7 @@
--with-omp_runtime_support=PATH Specify the prefix where Omni OpenMP Runtime System is installed
--with-gcc_omp Enables OMP in ROSE to run Compass thread parallel
--with-mpi Configure option to have MPI-based tools built.
+ --with-x use the X Window System
Prefer the Mesa library over a vendors native OpenGL library (default=yes)
--with-python Specify the path to the Python 2.4 interpreter (the binary itself)
--with-java use Java for Fortran or Javaport support (default is
@@ -1184,17 +1173,20 @@
--with-AxxPxx=PATH Specify the prefix where A++P++ is installed
--with-PERFORMANCE_TESTS ... compile and run performance tests within both A++ and P++
--with-QRose=PATH prefix of QRose installation
+ --with-qt=DIR where the QT root directory is.
+ --with-qt-inc=DIR where the QT includes are.
+ --with-qt-lib=DIR where the QT libraries are.
+ --with-qt-bin=DIR where the QT binaries are.
Some influential environment variables:
- CC C compiler command
- CFLAGS C compiler flags
+ CXX C++ compiler command
+ CXXFLAGS C++ compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
headers in a nonstandard directory <include dir>
- CPP C preprocessor
- CXX C++ compiler command
- CXXFLAGS C++ compiler flags
+ CC C compiler command
+ CFLAGS C compiler flags
CXXCPP C++ preprocessor
GFORTRAN_PATH
Absolute path to gfortran executable
@@ -2230,17 +2222,8 @@
#echo "Exiting as a test!"
#exit 1
+#AM_CONDITIONAL(ROSE_USE_QROSE,test "$with_qrose" = true)
-
-if test "$with_qrose" = true; then
- ROSE_USE_QROSE_TRUE=
- ROSE_USE_QROSE_FALSE='#'
-else
- ROSE_USE_QROSE_TRUE='#'
- ROSE_USE_QROSE_FALSE=
-fi
-
-
# Set up for use of bison to build dot2gml tool in directory
# src/roseIndependentSupport/dot2gml. This is made optional
# because it seems that many don't have the correct version of bison
@@ -2341,7 +2324,16 @@
# echo "In ROSE/configure: ROSE_HOME = $ROSE_HOME"
+# This does not appear to exist any more
# Support for Gabriel's QRose GUI Library
+# ROSE_SUPPORT_QROSE
+
+ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
DEPDIR="${am__leading_dot}deps"
ac_config_commands="$ac_config_commands depfiles"
@@ -2407,238 +2399,23 @@
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- CC=$ac_ct_CC
-else
- CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- CC=$ac_ct_CC
-else
- CC="$ac_cv_prog_CC"
-fi
-
-fi
-if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- fi
- ac_cv_prog_CC="cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
-if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
- set dummy $ac_cv_prog_CC
- shift
- if test $# != 0; then
- # We chose a different compiler from the bogus one.
- # However, it has the same basename, so the bogon will be chosen
- # first if we set CC to just the basename; use the full file name.
- shift
- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
- fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- for ac_prog in cl
+ for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
+if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
+ if test -n "$CXX"; then
+ ac_cv_prog_CXX="$CXX" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -2647,7 +2424,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -2656,31 +2433,31 @@
fi
fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+ echo "$as_me:$LINENO: result: $CXX" >&5
+echo "${ECHO_T}$CXX" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
- test -n "$CC" && break
+ test -n "$CXX" && break
done
fi
-if test -z "$CC"; then
- ac_ct_CC=$CC
- for ac_prog in cl
+if test -z "$CXX"; then
+ ac_ct_CXX=$CXX
+ for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+ if test -n "$ac_ct_CXX"; then
+ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -2689,7 +2466,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
+ ac_cv_prog_ac_ct_CXX="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -2698,33 +2475,26 @@
fi
fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+ echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+echo "${ECHO_T}$ac_ct_CXX" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
- test -n "$ac_ct_CC" && break
+ test -n "$ac_ct_CXX" && break
done
+test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
- CC=$ac_ct_CC
+ CXX=$ac_ct_CXX
fi
-fi
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-
# Provide some information about the compiler.
echo "$as_me:$LINENO:" \
- "checking for C compiler version" >&5
+ "checking for C++ compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
(eval $ac_compiler --version </dev/null >&5) 2>&5
@@ -2762,8 +2532,8 @@
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
+echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6
ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
(eval $ac_link_default) 2>&5
@@ -2806,9 +2576,9 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { echo "$as_me:$LINENO: error: C++ compiler cannot create executables
See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+echo "$as_me: error: C++ compiler cannot create executables
See \`config.log' for more details." >&2;}
{ (exit 77); exit 77; }; }
fi
@@ -2819,8 +2589,8 @@
# Check the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
+echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
# If not cross compiling, check that we can run a simple program.
if test "$cross_compiling" != yes; then
@@ -2835,10 +2605,10 @@
if test "$cross_compiling" = maybe; then
cross_compiling=yes
else
- { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+ { { echo "$as_me:$LINENO: error: cannot run C++ compiled programs.
If you meant to cross compile, use \`--host'.
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+echo "$as_me: error: cannot run C++ compiled programs.
If you meant to cross compile, use \`--host'.
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
@@ -2943,9 +2713,9 @@
echo "${ECHO_T}$ac_cv_objext" >&6
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
+echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -2975,7 +2745,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
+ { ac_try='test -z "$ac_cxx_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
@@ -2996,18 +2766,18 @@
ac_compiler_gnu=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
+echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
+GXX=`test $ac_compiler_gnu = yes && echo yes`
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="-g"
+echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
+if test "${ac_cv_prog_cxx_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -3034,7 +2804,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
+ { ac_try='test -z "$ac_cxx_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
@@ -3047,179 +2817,33 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_prog_cc_g=yes
+ ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_prog_cc_g=no
+ac_cv_prog_cxx_g=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
- CFLAGS="-g -O2"
+echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
+if test "$ac_test_CXXFLAGS" = set; then
+ CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+ if test "$GXX" = yes; then
+ CXXFLAGS="-g -O2"
else
- CFLAGS="-g"
+ CXXFLAGS="-g"
fi
else
- if test "$GCC" = yes; then
- CFLAGS="-O2"
+ if test "$GXX" = yes; then
+ CXXFLAGS="-O2"
else
- CFLAGS=
+ CXXFLAGS=
fi
fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_prog_cc_stdc=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
- char **p;
- int i;
-{
- return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
- char *s;
- va_list v;
- va_start (v,p);
- s = g (p, va_arg (v,int));
- va_end (v);
- return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std1 is added to get
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
- array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std1. */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
- ;
- return 0;
-}
-_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX -qlanglvl=ansi
-# Ultrix and OSF/1 -std1
-# HP-UX 10.20 and later -Ae
-# HP-UX older versions -Aa -D_HPUX_SOURCE
-# SVR4 -Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
- CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_prog_cc_stdc=$ac_arg
-break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext
-done
-rm -f conftest.$ac_ext conftest.$ac_objext
-CC=$ac_save_CC
-
-fi
-
-case "x$ac_cv_prog_cc_stdc" in
- x|xno)
- echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
- *)
- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
- CC="$CC $ac_cv_prog_cc_stdc" ;;
-esac
-
-# Some people use a C++ compiler to compile C. Since we use `exit',
-# in C++ we need to declare it. In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
- choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- for ac_declaration in \
+for ac_declaration in \
'' \
'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \
@@ -3252,7 +2876,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
+ { ac_try='test -z "$ac_cxx_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
@@ -3297,7 +2921,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
+ { ac_try='test -z "$ac_cxx_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
@@ -3325,23 +2949,17 @@
echo '#endif' >>confdefs.h
fi
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+depcc="$CXX" am_compiler_list=
-depcc="$CC" am_compiler_list=
-
echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -3363,7 +2981,7 @@
# directory.
mkdir sub
- am_cv_CC_dependencies_compiler_type=none
+ am_cv_CXX_dependencies_compiler_type=none
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
fi
@@ -3416,7 +3034,7 @@
# icc: Command line remark: option '-MP' not supported
if (grep 'ignoring option' conftest.err ||
grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_CC_dependencies_compiler_type=$depmode
+ am_cv_CXX_dependencies_compiler_type=$depmode
break
fi
fi
@@ -3425,1028 +3043,566 @@
cd ..
rm -rf conftest.dir
else
- am_cv_CC_dependencies_compiler_type=none
+ am_cv_CXX_dependencies_compiler_type=none
fi
fi
-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
if
test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
- am__fastdepCC_TRUE=
- am__fastdepCC_FALSE='#'
+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+ am__fastdepCXX_TRUE=
+ am__fastdepCXX_FALSE='#'
else
- am__fastdepCC_TRUE='#'
- am__fastdepCC_FALSE=
+ am__fastdepCXX_TRUE='#'
+ am__fastdepCXX_FALSE=
fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-fi
-if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- # Double quotes because CPP needs to be expanded
- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
- do
- ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- # Broken: success on invalid input.
-continue
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# Check whether --with-boost or --without-boost was given.
+if test "${with_boost+set}" = set; then
+ withval="$with_boost"
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
+ if test "$withval" = "no"; then
+ want_boost="no"
+ elif test "$withval" = "yes"; then
+ want_boost="yes"
+ ac_boost_path=""
+ else
+ want_boost="yes"
+ ac_boost_path="$withval"
+ fi
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- break
-fi
-
- done
- ac_cv_prog_CPP=$CPP
-
-fi
- CPP=$ac_cv_prog_CPP
else
- ac_cv_prog_CPP=$CPP
-fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ want_boost="yes"
+fi;
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- # Broken: success on invalid input.
-continue
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
+# Check whether --with-boost-libdir or --without-boost-libdir was given.
+if test "${with_boost_libdir+set}" = set; then
+ withval="$with_boost_libdir"
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- :
-else
- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
+ if test -d $withval
+ then
+ ac_boost_lib_path="$withval"
+ else
+ { { echo "$as_me:$LINENO: error: --with-boost-libdir expected directory name" >&5
+echo "$as_me: error: --with-boost-libdir expected directory name" >&2;}
{ (exit 1); exit 1; }; }
-fi
+ fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-echo "$as_me:$LINENO: checking for windows" >&5
-echo $ECHO_N "checking for windows... $ECHO_C" >&6
-USING_MINGW32=0
-if test "$host_os" = cygwin; then
- USING_WINDOWS=1
- echo "$as_me:$LINENO: result: yes: cygwin. Use --build=mingw32 for dll library!" >&5
-echo "${ECHO_T}yes: cygwin. Use --build=mingw32 for dll library!" >&6
else
- if test "$host_os" = mingw32; then
- USING_WINDOWS=1
- USING_MINGW32=1
- echo "$as_me:$LINENO: result: yes: mingw32" >&5
-echo "${ECHO_T}yes: mingw32" >&6
- else
- echo "$as_me:$LINENO: result: no: $host_os" >&5
-echo "${ECHO_T}no: $host_os" >&6
- USING_WINDOWS=0
- fi
-fi
+ ac_boost_lib_path=""
-
-
-
-if test $USING_MINGW32 = 1; then
- QROSE_USE_MINGW32_TRUE=
- QROSE_USE_MINGW32_FALSE='#'
-else
- QROSE_USE_MINGW32_TRUE='#'
- QROSE_USE_MINGW32_FALSE=
-fi
-
-
-
-if test $USING_WINDOWS = 1; then
- QROSE_USE_WINDOWS_TRUE=
- QROSE_USE_WINDOWS_FALSE='#'
-else
- QROSE_USE_WINDOWS_TRUE='#'
- QROSE_USE_WINDOWS_FALSE=
-fi
-
-
-
-# Begin macro ROSE_SUPPORT_ QROSE.
-
-
-# Check whether --with-QRose or --without-QRose was given.
-if test "${with_QRose+set}" = set; then
- withval="$with_QRose"
-
fi;
-# Test if it is defined and if not then set it to be defined as "no"
-if test ! "$with_QRose" ; then
- with_QRose=no
-fi
+if test "x$want_boost" = "xyes"; then
+ boost_lib_version_req=1.35.0
+ boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([0-9]*\.[0-9]*\)'`
+ boost_lib_version_req_major=`expr $boost_lib_version_req : '\([0-9]*\)'`
+ boost_lib_version_req_minor=`expr $boost_lib_version_req : '[0-9]*\.\([0-9]*\)'`
+ boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[0-9]*\.[0-9]*\.\([0-9]*\)'`
+ if test "x$boost_lib_version_req_sub_minor" = "x" ; then
+ boost_lib_version_req_sub_minor="0"
+ fi
+ WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
+ echo "$as_me:$LINENO: checking for boostlib >= $boost_lib_version_req" >&5
+echo $ECHO_N "checking for boostlib >= $boost_lib_version_req... $ECHO_C" >&6
+ succeeded=no
-# echo "with_QRose = $with_QRose"
+ if test "$ac_boost_path" != ""; then
+ BOOST_LDFLAGS=" -L$ac_boost_path/lib"
+ BOOST_CPPFLAGS="-I$ac_boost_path/include"
+ else
+ for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
+ if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
+ BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib"
+ BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
+ break;
+ fi
+ done
+ fi
-# Only query for QT library if we are trying to build ROSE with QRose (Gabriel's GUI work)
-# Not clear if this is sufficently powerful of a serach mechanism to find teh required libraries.
-if (test "$with_QRose" = yes); then
+ if test "$ac_boost_lib_path" != ""; then
+ BOOST_LDFLAGS="-L$ac_boost_lib_path"
+ fi
-VAR_WIN32=0
-VAR_CYGWIN=0
+ CPPFLAGS_SAVED="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ export CPPFLAGS
-echo "$as_me:$LINENO: checking for X" >&5
-echo $ECHO_N "checking for X... $ECHO_C" >&6
+ LDFLAGS_SAVED="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+ export LDFLAGS
+ ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-# Check whether --with-x or --without-x was given.
-if test "${with_x+set}" = set; then
- withval="$with_x"
-
-fi;
-# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
-if test "x$with_x" = xno; then
- # The user explicitly disabled X.
- have_x=disabled
-else
- if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
- # Both variables are already set.
- have_x=yes
- else
- if test "${ac_cv_have_x+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- # One or both of the vars are not set, and there is no cached value.
-ac_x_includes=no ac_x_libraries=no
-rm -fr conftest.dir
-if mkdir conftest.dir; then
- cd conftest.dir
- # Make sure to not put "make" in the Imakefile rules, since we grep it out.
- cat >Imakefile <<'_ACEOF'
-acfindx:
- @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-_ACEOF
- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
- # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
- for ac_extension in a so sl; do
- if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
- test -f $ac_im_libdir/libX11.$ac_extension; then
- ac_im_usrlibdir=$ac_im_libdir; break
- fi
- done
- # Screen out bogus values from the imake configuration. They are
- # bogus both because they are the default anyway, and because
- # using them would break gcc on systems where it needs fixed includes.
- case $ac_im_incroot in
- /usr/include) ;;
- *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
- esac
- case $ac_im_usrlibdir in
- /usr/lib | /lib) ;;
- *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
- esac
- fi
- cd ..
- rm -fr conftest.dir
-fi
-
-# Standard set of common directories for X headers.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-ac_x_header_dirs='
-/usr/X11/include
-/usr/X11R6/include
-/usr/X11R5/include
-/usr/X11R4/include
-
-/usr/include/X11
-/usr/include/X11R6
-/usr/include/X11R5
-/usr/include/X11R4
-
-/usr/local/X11/include
-/usr/local/X11R6/include
-/usr/local/X11R5/include
-/usr/local/X11R4/include
-
-/usr/local/include/X11
-/usr/local/include/X11R6
-/usr/local/include/X11R5
-/usr/local/include/X11R4
-
-/usr/X386/include
-/usr/x386/include
-/usr/XFree86/include/X11
-
-/usr/include
-/usr/local/include
-/usr/unsupported/include
-/usr/athena/include
-/usr/local/x11r5/include
-/usr/lpp/Xamples/include
-
-/usr/openwin/include
-/usr/openwin/share/include'
-
-if test "$ac_x_includes" = no; then
- # Guess where to find include files, by looking for Intrinsic.h.
- # First, try using that file with no special directory specified.
- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- # We can compile using X headers with no special include directory.
-ac_x_includes=
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Intrinsic.h"; then
- ac_x_includes=$ac_dir
- break
- fi
-done
-fi
-rm -f conftest.err conftest.$ac_ext
-fi # $ac_x_includes = no
+ #include <boost/version.hpp>
-if test "$ac_x_libraries" = no; then
- # Check for the libraries.
- # See if we find them without any special options.
- # Don't add to $LIBS permanently.
- ac_save_LIBS=$LIBS
- LIBS="-lXt $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <X11/Intrinsic.h>
int
main ()
{
-XtMalloc (0)
+
+ #if BOOST_VERSION >= $WANT_BOOST_VERSION
+ // Everything is okay
+ #else
+ # error Boost version is too old
+ #endif
+
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
+ { ac_try='test -z "$ac_cxx_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- LIBS=$ac_save_LIBS
-# We can link X programs with no special library path.
-ac_x_libraries=
+
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ succeeded=yes
+ found_system=yes
+
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-LIBS=$ac_save_LIBS
-for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
-do
- # Don't even attempt the hair of trying to link an X program!
- for ac_extension in a so sl; do
- if test -r $ac_dir/libXt.$ac_extension; then
- ac_x_libraries=$ac_dir
- break 2
- fi
- done
-done
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi # $ac_x_libraries = no
-if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
- # Didn't find X anywhere. Cache the known absence of X.
- ac_cv_have_x="have_x=no"
-else
- # Record where we found X for the cache.
- ac_cv_have_x="have_x=yes \
- ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
-fi
-fi
- fi
- eval "$ac_cv_have_x"
-fi # $with_x != no
-
-if test "$have_x" != yes; then
- echo "$as_me:$LINENO: result: $have_x" >&5
-echo "${ECHO_T}$have_x" >&6
- no_x=yes
-else
- # If each of the values was on the command line, it overrides each guess.
- test "x$x_includes" = xNONE && x_includes=$ac_x_includes
- test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
- # Update the cache value to reflect the command line values.
- ac_cv_have_x="have_x=yes \
- ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
- echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-echo "$as_me:$LINENO: checking for Qt" >&5
-echo $ECHO_N "checking for Qt... $ECHO_C" >&6
-# Check whether --with-qt or --without-qt was given.
-if test "${with_qt+set}" = set; then
- withval="$with_qt"
- ac_qt_path="$withval"
+ if test "x$succeeded" != "xyes"; then
+ _version=0
+ if test "$ac_boost_path" != ""; then
+ if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
+ for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
+ _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
+ V_CHECK=`expr $_version_tmp \> $_version`
+ if test "$V_CHECK" = "1" ; then
+ _version=$_version_tmp
+ fi
+ VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
+ BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
+ done
+ fi
+ else
+ for ac_boost_path in /usr /usr/local /opt /opt/local ; do
+ if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
+ for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
+ _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
+ V_CHECK=`expr $_version_tmp \> $_version`
+ if test "$V_CHECK" = "1" ; then
+ _version=$_version_tmp
+ best_path=$ac_boost_path
+ fi
+ done
+ fi
+ done
-fi;
+ VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
+ BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
+ if test "$ac_boost_lib_path" = ""
+ then
+ BOOST_LDFLAGS="-L$best_path/lib"
+ fi
+ if test "x$BOOST_ROOT" != "x"; then
+ if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/lib" && test -r "$BOOST_ROOT/stage/lib"; then
+ version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'`
+ stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
+ stage_version_shorten=`expr $stage_version : '\([0-9]*\.[0-9]*\)'`
+ V_CHECK=`expr $stage_version_shorten \>\= $_version`
+ if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then
+ { echo "$as_me:$LINENO: We will use a staged boost library from $BOOST_ROOT" >&5
+echo "$as_me: We will use a staged boost library from $BOOST_ROOT" >&6;}
+ BOOST_CPPFLAGS="-I$BOOST_ROOT"
+ BOOST_LDFLAGS="-L$BOOST_ROOT/stage/lib"
+ fi
+ fi
+ fi
+ fi
-# Check whether --with-qt-inc or --without-qt-inc was given.
-if test "${with_qt_inc+set}" = set; then
- withval="$with_qt_inc"
- ac_qt_includes="$withval"
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ export CPPFLAGS
+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+ export LDFLAGS
-fi;
+ ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-# Check whether --with-qt-lib or --without-qt-lib was given.
-if test "${with_qt_lib+set}" = set; then
- withval="$with_qt_lib"
- ac_qt_libraries="$withval"
-
-fi;
-
- qt_incdirs="$ac_qt_includes $ac_qt_path/include /usr/include/qt4"
-
-qt_incdir=NONE
-for i in $qt_incdirs;
-do
- for j in QtGui/qapplication.h;
- do
- if test -r "$i/$j"; then
- qt_incdir=$i
- break 2
- fi
- done
-done
-
- if test "$with_QRose" != no && test "$qt_incdir" = NONE; then
- { { echo "$as_me:$LINENO: error: Qt headers not found, use --with-qt=DIR or --with-qt-includes=DIR" >&5
-echo "$as_me: error: Qt headers not found, use --with-qt=DIR or --with-qt-includes=DIR" >&2;}
- { (exit 1); exit 1; }; }
- fi
- QT_INCLUDES="-I$qt_incdir/QtCore -I$qt_incdir/QtGui -I$qt_incdir"
-
-
- qt_libdirs="$ac_qt_libraries $ac_qt_path/lib /usr/lib"
-
-qt_libdir=NONE
-
-for i in $qt_libdirs;
-do
- for j in libQtGui;
- do
- try="ls -l $i/$j*"
- if test=`eval $try 2> /dev/null`; then
- qt_libdir=$i
- break 2
- fi
- done
-done
-
- if test "$with_QRose" != no && test "$qt_libdir" = NONE; then
- { { echo "$as_me:$LINENO: error: Qt libraries not found, use --with-qt=DIR or --with-qt-libraries=DIR " >&5
-echo "$as_me: error: Qt libraries not found, use --with-qt=DIR or --with-qt-libraries=DIR " >&2;}
- { (exit 1); exit 1; }; }
- fi
- QT_LDFLAGS="-L$qt_libdir -lQtCore -lQtGui"
-
- echo "$as_me:$LINENO: result: headers $qt_incdir, libraries $qt_libdir " >&5
-echo "${ECHO_T} headers $qt_incdir, libraries $qt_libdir " >&6
-
-
-
-
-
-
-# Check whether --with-qt-bin or --without-qt-bin was given.
-if test "${with_qt_bin+set}" = set; then
- withval="$with_qt_bin"
- ac_qt_bin="$withval"
-
-fi;
-
-
- moc_dirs="$ac_qt_bin $ac_qt_path/bin `echo $PATH | sed s/:/\ /g`"
- if test $USING_WINDOWS = 1; then
- moc_binary="moc.exe"
- else
- moc_binary="moc"
- fi
-
- echo "$as_me:$LINENO: checking for Qt meta-object compiler" >&5
-echo $ECHO_N "checking for Qt meta-object compiler... $ECHO_C" >&6
-
-moc_dir=NONE
-for i in $moc_dirs;
-do
- for j in $moc_binary;
- do
- if test -r "$i/$j"; then
- moc_dir=$i
- break 2
- fi
- done
-done
-
- if test "$with_QRose" != no && test "$moc_dir" = NONE; then
- { { echo "$as_me:$LINENO: error: No Qt meta object compiler ($moc_binary) found! (should be found in PATH, or --with-qt=DIR-qt_root, or --with-qt-bin=DIR-qt_bin)" >&5
-echo "$as_me: error: No Qt meta object compiler ($moc_binary) found! (should be found in PATH, or --with-qt=DIR-qt_root, or --with-qt-bin=DIR-qt_bin)" >&2;}
- { (exit 1); exit 1; }; }
- fi
- MOC=$moc_dir/$moc_binary
- echo "$as_me:$LINENO: result: $MOC" >&5
-echo "${ECHO_T}$MOC" >&6
- echo "$as_me:$LINENO: checking Qt meta-object compiler version" >&5
-echo $ECHO_N "checking Qt meta-object compiler version... $ECHO_C" >&6
-
- if test "$moc_dir" != NONE; then
- try=`$MOC -v 2>&1 | grep "Qt 4."`
- if test -z "$try"; then
- { { echo "$as_me:$LINENO: error: invalid version - $MOC must be version 4.x.x" >&5
-echo "$as_me: error: invalid version - $MOC must be version 4.x.x" >&2;}
- { (exit 1); exit 1; }; }
- else
- echo "$as_me:$LINENO: result: passed" >&5
-echo "${ECHO_T}passed" >&6
- fi
-
- fi
-
-
-
-if test ${VAR_WIN32} = 1
-then
-LIB_GL="-lglu32 -lopengl32"
-else
-LIB_GL="-lGLU -lGL -lXi -lXmu"
-fi
-echo "$as_me:$LINENO: checking for Open Gl" >&5
-echo $ECHO_N "checking for Open Gl... $ECHO_C" >&6
-
-ac_gl_includes="" ac_gl_libraries=""
-
-
-# Check whether --with-gl-includes or --without-gl-includes was given.
-if test "${with_gl_includes+set}" = set; then
- withval="$with_gl_includes"
- ac_gl_includes="$withval"
-
-fi;
-
-
-# Check whether --with-gl-libraries or --without-gl-libraries was given.
-if test "${with_gl_libraries+set}" = set; then
- withval="$with_gl_libraries"
- ac_gl_libraries="$withval"
-
-fi;
-
-if test "${ac_cv_have_gl+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-if test ${VAR_WIN32} = 1
-then
-gl_incdirs=" /mingw/include $ac_gl_includes $GLDIR/include /usr/include /usr/X11R6/include/X11 /usr/X11R6/include $x_includes "
-else
-gl_incdirs=" $ac_gl_includes $GLDIR/include /usr/include /usr/X11R6/include/X11 /usr/X11R6/include $x_includes "
-fi
-
-gl_incdir=NONE
-for i in $gl_incdirs;
-do
- for j in GL/gl.h;
- do
- if test -r "$i/$j"; then
- gl_incdir=$i
- break 2
- fi
- done
-done
-
-ac_gl_includes="$gl_incdir"
-
-if test ${VAR_WIN32} = 1
-then
-gl_libdirs="$GLDIR $ac_gl_libraries $GLLIB /usr/X11R6/lib /usr/lib /usr/local/lib $x_libraries "
-else
-gl_libdirs="$ac_gl_libraries $GLLIB /usr/X11R6/lib /usr/lib /usr/local/lib $x_libraries "
-fi
-
-test -n "$GLDIR" && gl_libdirs="$GLDIR/lib $GLDIR $gl_libdirs"
-test=NONE
-gl_libdir=NONE
-for dir in $gl_libdirs; do
-if test ${VAR_WIN32} = 1
-then
- try="ls -1 $dir/*opengl*"
-else
- try="ls -1 $dir/libGL*"
-fi
- if test=`eval $try 2> /dev/null`; then gl_libdir=$dir; break; else echo "tried $dir" >&5 ; fi
-done
-ac_gl_libraries="$gl_libdir"
-
- GL_INCLUDES="-I$ac_gl_includes"
- GL_LDFLAGS="-L$ac_gl_libraries"
-
-fi
-
-
-eval "$ac_cv_have_gl"
-if test "$ac_gl_libraries" = NONE; then
- { { echo "$as_me:$LINENO: error: Not found , put your GLDIR environnement variable to the OpenGL directory " >&5
-echo "$as_me: error: Not found , put your GLDIR environnement variable to the OpenGL directory " >&2;}
- { (exit 1); exit 1; }; };
-else
- ac_cv_have_gl="have_gl=yes \
- ac_gl_includes=$ac_gl_includes ac_gl_libraries=$ac_gl_libraries"
- echo "$as_me:$LINENO: result: libraries $ac_gl_libraries, headers $ac_gl_includes " >&5
-echo "${ECHO_T} libraries $ac_gl_libraries, headers $ac_gl_includes " >&6
- gl_libraries="$ac_gl_libraries"
- gl_includes="$ac_gl_includes"
- GL_INCLUDES="-I$ac_gl_includes"
- GL_LDFLAGS="-L$ac_gl_libraries"
-fi
-
-
-
-
-
-
-if test ${VAR_WIN32} = 1
-then
-LIB_GL="-lglu32 -lopengl32"
-else
-LIB_GL="-lGLU -lGL -lXi -lXmu"
-fi
-
-
-
-echo "$as_me:$LINENO: checking for png_create_write_struct in -lpng" >&5
-echo $ECHO_N "checking for png_create_write_struct in -lpng... $ECHO_C" >&6
-if test "${ac_cv_lib_png_png_create_write_struct+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpng $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char png_create_write_struct ();
+ #include <boost/version.hpp>
+
int
main ()
{
-png_create_write_struct ();
+
+ #if BOOST_VERSION >= $WANT_BOOST_VERSION
+ // Everything is okay
+ #else
+ # error Boost version is too old
+ #endif
+
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
+ { ac_try='test -z "$ac_cxx_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_png_png_create_write_struct=yes
+
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ succeeded=yes
+ found_system=yes
+
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_png_png_create_write_struct=no
+
+
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_create_write_struct" >&5
-echo "${ECHO_T}$ac_cv_lib_png_png_create_write_struct" >&6
-if test $ac_cv_lib_png_png_create_write_struct = yes; then
- LIB_IMAGES_LDFLAGS="${LIB_IMAGES_LDFLAGS} -lpng"
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ fi
+
+ if test "$succeeded" != "yes" ; then
+ if test "$_version" = "0" ; then
+ { { echo "$as_me:$LINENO: error: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation." >&5
+echo "$as_me: error: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ { echo "$as_me:$LINENO: Your boost libraries seems to old (version $_version)." >&5
+echo "$as_me: Your boost libraries seems to old (version $_version)." >&6;}
+ fi
+ else
+
+
+
cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBPNG 1
+#define HAVE_BOOST
_ACEOF
- PNG=true
+ fi
+ CPPFLAGS="$CPPFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
fi
-# AM_CONDITIONAL(PNG, test x$PNG = xtrue)
-echo "$as_me:$LINENO: checking for jpeg_std_error in -ljpeg" >&5
-echo $ECHO_N "checking for jpeg_std_error in -ljpeg... $ECHO_C" >&6
-if test "${ac_cv_lib_jpeg_jpeg_std_error+set}" = set; then
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ljpeg $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char jpeg_std_error ();
-int
-main ()
-{
-jpeg_std_error ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_jpeg_jpeg_std_error=yes
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
-ac_cv_lib_jpeg_jpeg_std_error=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_std_error" >&5
-echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_std_error" >&6
-if test $ac_cv_lib_jpeg_jpeg_std_error = yes; then
- LIB_IMAGES_LDFLAGS="${LIB_IMAGES_LDFLAGS} -ljpeg"
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBJPEG 1
-_ACEOF
+fi
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_CC="gcc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
- JPEG=true
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+ CC=$ac_ct_CC
+else
+ CC="$ac_cv_prog_CC"
fi
-# AM_CONDITIONAL(JPEG, test x$JPEG = xtrue)
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
fi
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_CC="cc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
-# Required to support QRose (internally)
-
-
-if test x$PNG = xtrue; then
- PNG_TRUE=
- PNG_FALSE='#'
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
else
- PNG_TRUE='#'
- PNG_FALSE=
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-
-
-if test x$JPEG = xtrue; then
- JPEG_TRUE=
- JPEG_FALSE='#'
+ CC=$ac_ct_CC
else
- JPEG_TRUE='#'
- JPEG_FALSE=
+ CC="$ac_cv_prog_CC"
fi
+fi
+if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
-# Conditional to control use of QRose
-
-
-if test $with_QRose = yes; then
- ROSE_USE_QROSE_TRUE=
- ROSE_USE_QROSE_FALSE='#'
+if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+ set dummy $ac_cv_prog_CC
+ shift
+ if test $# != 0; then
+ # We chose a different compiler from the bogus one.
+ # However, it has the same basename, so the bogon will be chosen
+ # first if we set CC to just the basename; use the full file name.
+ shift
+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+ fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
else
- ROSE_USE_QROSE_TRUE='#'
- ROSE_USE_QROSE_FALSE=
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-
-# End macro ROSE_SUPPORT_ QROSE.
-
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -n "$ac_tool_prefix"; then
- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+fi
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in cl
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CXX+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$CXX"; then
- ac_cv_prog_CXX="$CXX" # Let the user override the test.
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -4455,7 +3611,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -4464,31 +3620,31 @@
fi
fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
- echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
- test -n "$CXX" && break
+ test -n "$CC" && break
done
fi
-if test -z "$CXX"; then
- ac_ct_CXX=$CXX
- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+if test -z "$CC"; then
+ ac_ct_CC=$CC
+ for ac_prog in cl
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$ac_ct_CXX"; then
- ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -4497,7 +3653,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CXX="$ac_prog"
+ ac_cv_prog_ac_ct_CC="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -4506,26 +3662,33 @@
fi
fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
- echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
- test -n "$ac_ct_CXX" && break
+ test -n "$ac_ct_CC" && break
done
-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
- CXX=$ac_ct_CXX
+ CC=$ac_ct_CC
fi
+fi
+
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+
# Provide some information about the compiler.
echo "$as_me:$LINENO:" \
- "checking for C++ compiler version" >&5
+ "checking for C compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
(eval $ac_compiler --version </dev/null >&5) 2>&5
@@ -4543,9 +3706,9 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -4575,7 +3738,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
+ { ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
@@ -4596,18 +3759,18 @@
ac_compiler_gnu=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
-GXX=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cxx_g+set}" = set; then
+echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+GCC=`test $ac_compiler_gnu = yes && echo yes`
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+CFLAGS="-g"
+echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
@@ -4634,7 +3797,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
+ { ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
@@ -4647,33 +3810,179 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_prog_cxx_g=yes
+ ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_prog_cxx_g=no
+ac_cv_prog_cc_g=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
-if test "$ac_test_CXXFLAGS" = set; then
- CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
- if test "$GXX" = yes; then
- CXXFLAGS="-g -O2"
+echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+ if test "$GCC" = yes; then
+ CFLAGS="-g -O2"
else
- CXXFLAGS="-g"
+ CFLAGS="-g"
fi
else
- if test "$GXX" = yes; then
- CXXFLAGS="-O2"
+ if test "$GCC" = yes; then
+ CFLAGS="-O2"
else
- CXXFLAGS=
+ CFLAGS=
fi
fi
-for ac_declaration in \
+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_stdc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_prog_cc_stdc=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+ char **p;
+ int i;
+{
+ return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+ char *s;
+ va_list v;
+ va_start (v,p);
+ s = g (p, va_arg (v,int));
+ va_end (v);
+ return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std1 is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
+ that's true only with -std1. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ return 0;
+}
+_ACEOF
+# Don't try gcc -ansi; that turns off useful extensions and
+# breaks some systems' header files.
+# AIX -qlanglvl=ansi
+# Ultrix and OSF/1 -std1
+# HP-UX 10.20 and later -Ae
+# HP-UX older versions -Aa -D_HPUX_SOURCE
+# SVR4 -Xc -D__EXTENSIONS__
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+ CC="$ac_save_CC $ac_arg"
+ rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_prog_cc_stdc=$ac_arg
+break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext
+done
+rm -f conftest.$ac_ext conftest.$ac_objext
+CC=$ac_save_CC
+
+fi
+
+case "x$ac_cv_prog_cc_stdc" in
+ x|xno)
+ echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6 ;;
+ *)
+ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+ CC="$CC $ac_cv_prog_cc_stdc" ;;
+esac
+
+# Some people use a C++ compiler to compile C. Since we use `exit',
+# in C++ we need to declare it. In case someone uses the same compiler
+# for both compiling C and C++ we need to have the C++ compiler decide
+# the declaration of exit, since it's the most demanding environment.
+cat >conftest.$ac_ext <<_ACEOF
+#ifndef __cplusplus
+ choke me
+#endif
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ for ac_declaration in \
'' \
'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \
@@ -4706,7 +4015,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
+ { ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
@@ -4751,7 +4060,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
+ { ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
@@ -4779,17 +4088,23 @@
echo '#endif' >>confdefs.h
fi
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-depcc="$CXX" am_compiler_list=
+depcc="$CC" am_compiler_list=
echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4811,7 +4126,7 @@
# directory.
mkdir sub
- am_cv_CXX_dependencies_compiler_type=none
+ am_cv_CC_dependencies_compiler_type=none
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
fi
@@ -4864,7 +4179,7 @@
# icc: Command line remark: option '-MP' not supported
if (grep 'ignoring option' conftest.err ||
grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_CXX_dependencies_compiler_type=$depmode
+ am_cv_CC_dependencies_compiler_type=$depmode
break
fi
fi
@@ -4873,336 +4188,29 @@
cd ..
rm -rf conftest.dir
else
- am_cv_CXX_dependencies_compiler_type=none
+ am_cv_CC_dependencies_compiler_type=none
fi
fi
-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
if
test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
- am__fastdepCXX_TRUE=
- am__fastdepCXX_FALSE='#'
+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+ am__fastdepCC_TRUE=
+ am__fastdepCC_FALSE='#'
else
- am__fastdepCXX_TRUE='#'
- am__fastdepCXX_FALSE=
+ am__fastdepCC_TRUE='#'
+ am__fastdepCC_FALSE=
fi
-
-# Check whether --with-boost or --without-boost was given.
-if test "${with_boost+set}" = set; then
- withval="$with_boost"
-
- if test "$withval" = "no"; then
- want_boost="no"
- elif test "$withval" = "yes"; then
- want_boost="yes"
- ac_boost_path=""
- else
- want_boost="yes"
- ac_boost_path="$withval"
- fi
-
-else
- want_boost="yes"
-fi;
-
-
-
-# Check whether --with-boost-libdir or --without-boost-libdir was given.
-if test "${with_boost_libdir+set}" = set; then
- withval="$with_boost_libdir"
-
- if test -d $withval
- then
- ac_boost_lib_path="$withval"
- else
- { { echo "$as_me:$LINENO: error: --with-boost-libdir expected directory name" >&5
-echo "$as_me: error: --with-boost-libdir expected directory name" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-else
- ac_boost_lib_path=""
-
-fi;
-
-if test "x$want_boost" = "xyes"; then
- boost_lib_version_req=1.35.0
- boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([0-9]*\.[0-9]*\)'`
- boost_lib_version_req_major=`expr $boost_lib_version_req : '\([0-9]*\)'`
- boost_lib_version_req_minor=`expr $boost_lib_version_req : '[0-9]*\.\([0-9]*\)'`
- boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[0-9]*\.[0-9]*\.\([0-9]*\)'`
- if test "x$boost_lib_version_req_sub_minor" = "x" ; then
- boost_lib_version_req_sub_minor="0"
- fi
- WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
- echo "$as_me:$LINENO: checking for boostlib >= $boost_lib_version_req" >&5
-echo $ECHO_N "checking for boostlib >= $boost_lib_version_req... $ECHO_C" >&6
- succeeded=no
-
- if test "$ac_boost_path" != ""; then
- BOOST_LDFLAGS=" -L$ac_boost_path/lib"
- BOOST_CPPFLAGS="-I$ac_boost_path/include"
- else
- for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
- if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
- BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib"
- BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
- break;
- fi
- done
- fi
-
- if test "$ac_boost_lib_path" != ""; then
- BOOST_LDFLAGS="-L$ac_boost_lib_path"
- fi
-
- CPPFLAGS_SAVED="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
-
- LDFLAGS_SAVED="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
-
- ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
- #include <boost/version.hpp>
-
-int
-main ()
-{
-
- #if BOOST_VERSION >= $WANT_BOOST_VERSION
- // Everything is okay
- #else
- # error Boost version is too old
- #endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- succeeded=yes
- found_system=yes
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-
-
- if test "x$succeeded" != "xyes"; then
- _version=0
- if test "$ac_boost_path" != ""; then
- if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
- for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
- _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
- V_CHECK=`expr $_version_tmp \> $_version`
- if test "$V_CHECK" = "1" ; then
- _version=$_version_tmp
- fi
- VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
- BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
- done
- fi
- else
- for ac_boost_path in /usr /usr/local /opt /opt/local ; do
- if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
- for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
- _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
- V_CHECK=`expr $_version_tmp \> $_version`
- if test "$V_CHECK" = "1" ; then
- _version=$_version_tmp
- best_path=$ac_boost_path
- fi
- done
- fi
- done
-
- VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
- BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
- if test "$ac_boost_lib_path" = ""
- then
- BOOST_LDFLAGS="-L$best_path/lib"
- fi
-
- if test "x$BOOST_ROOT" != "x"; then
- if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/lib" && test -r "$BOOST_ROOT/stage/lib"; then
- version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'`
- stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
- stage_version_shorten=`expr $stage_version : '\([0-9]*\.[0-9]*\)'`
- V_CHECK=`expr $stage_version_shorten \>\= $_version`
- if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then
- { echo "$as_me:$LINENO: We will use a staged boost library from $BOOST_ROOT" >&5
-echo "$as_me: We will use a staged boost library from $BOOST_ROOT" >&6;}
- BOOST_CPPFLAGS="-I$BOOST_ROOT"
- BOOST_LDFLAGS="-L$BOOST_ROOT/stage/lib"
- fi
- fi
- fi
- fi
-
- CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
- export CPPFLAGS
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- export LDFLAGS
-
- ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
- #include <boost/version.hpp>
-
-int
-main ()
-{
-
- #if BOOST_VERSION >= $WANT_BOOST_VERSION
- // Everything is okay
- #else
- # error Boost version is too old
- #endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- succeeded=yes
- found_system=yes
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- fi
-
- if test "$succeeded" != "yes" ; then
- if test "$_version" = "0" ; then
- { { echo "$as_me:$LINENO: error: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation." >&5
-echo "$as_me: error: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation." >&2;}
- { (exit 1); exit 1; }; }
- else
- { echo "$as_me:$LINENO: Your boost libraries seems to old (version $_version)." >&5
-echo "$as_me: Your boost libraries seems to old (version $_version)." >&6;}
- fi
- else
-
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BOOST
-_ACEOF
-
- fi
-
- CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
-fi
-
-
-
-
# Check whether --with-boost-thread or --without-boost-thread was given.
if test "${with_boost_thread+set}" = set; then
withval="$with_boost_thread"
@@ -12459,6 +11467,7 @@
+
echo "$as_me:$LINENO: checking for OpenGL" >&5
echo $ECHO_N "checking for OpenGL... $ECHO_C" >&6
if test "${mdl_cv_have_OpenGL+set}" = set; then
@@ -15381,7 +14390,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 15384 "configure"' > conftest.$ac_ext
+ echo '#line 14393 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -16685,7 +15694,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 16688 "configure"
+#line 15697 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18608,7 +17617,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 18611 "configure"' > conftest.$ac_ext
+ echo '#line 17620 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -18862,7 +17871,7 @@
# Provide some information about the compiler.
-echo "$as_me:18865:" \
+echo "$as_me:17874:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -19900,11 +18909,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19903: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18912: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:19907: \$? = $ac_status" >&5
+ echo "$as_me:18916: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -20133,11 +19142,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:20136: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19145: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:20140: \$? = $ac_status" >&5
+ echo "$as_me:19149: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -20193,11 +19202,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:20196: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19205: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:20200: \$? = $ac_status" >&5
+ echo "$as_me:19209: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -21527,7 +20536,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 21530 "configure"' > conftest.$ac_ext
+ echo '#line 20539 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -22398,7 +21407,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 22401 "configure"
+#line 21410 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -22496,7 +21505,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 22499 "configure"
+#line 21508 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -24679,11 +23688,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:24682: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:23691: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:24686: \$? = $ac_status" >&5
+ echo "$as_me:23695: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -24739,11 +23748,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:24742: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:23751: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:24746: \$? = $ac_status" >&5
+ echo "$as_me:23755: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -25250,7 +24259,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 25253 "configure"' > conftest.$ac_ext
+ echo '#line 24262 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -26121,7 +25130,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 26124 "configure"
+#line 25133 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -26219,7 +25228,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 26222 "configure"
+#line 25231 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -27046,11 +26055,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:27049: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:26058: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:27053: \$? = $ac_status" >&5
+ echo "$as_me:26062: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -27106,11 +26115,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:27109: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:26118: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:27113: \$? = $ac_status" >&5
+ echo "$as_me:26122: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -28420,7 +27429,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 28423 "configure"' > conftest.$ac_ext
+ echo '#line 27432 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -29165,11 +28174,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:29168: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:28177: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:29172: \$? = $ac_status" >&5
+ echo "$as_me:28181: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -29398,11 +28407,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:29401: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:28410: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:29405: \$? = $ac_status" >&5
+ echo "$as_me:28414: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -29458,11 +28467,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:29461: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:28470: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:29465: \$? = $ac_status" >&5
+ echo "$as_me:28474: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -30792,7 +29801,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 30795 "configure"' > conftest.$ac_ext
+ echo '#line 29804 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -31663,7 +30672,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 31666 "configure"
+#line 30675 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -31761,7 +30770,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 31764 "configure"
+#line 30773 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -33086,8 +32095,8 @@
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- echo "configure:33089:" CXXP is $CXX >&5
- echo "configure:33090:" CXXCPP is $CXXCPP >&5
+ echo "configure:32098:" CXXP is $CXX >&5
+ echo "configure:32099:" CXXCPP is $CXXCPP >&5
CXX_ID=unknown
CXX_VERSION=unknown
@@ -33096,7 +32105,7 @@
# Check if it is a Sun compiler.
if test $CXX_ID = unknown; then
- echo "configure:33099:" checking if $CXX is sunpro >&5
+ echo "configure:32108:" checking if $CXX is sunpro >&5
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -33123,7 +32132,7 @@
# Check if it is a GNU compiler.
if test $CXX_ID = unknown; then
- echo "configure:33126:" checking if $CXX is gnu >&5
+ echo "configure:32135:" checking if $CXX is gnu >&5
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -33151,7 +32160,7 @@
# Check if it is a DEC compiler.
if test $CXX_ID = unknown; then
- echo "configure:33154:" checking if $CXX is dec >&5
+ echo "configure:32163:" checking if $CXX is dec >&5
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -33176,7 +32185,7 @@
# Check if it is a KAI compiler.
if test $CXX_ID = unknown; then
- echo "configure:33179:" checking if $CXX is kai >&5
+ echo "configure:32188:" checking if $CXX is kai >&5
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -33201,7 +32210,7 @@
# Check if it is a SGI compiler.
if test $CXX_ID = unknown; then
- echo "configure:33204:" checking if $CXX is sgi >&5
+ echo "configure:32213:" checking if $CXX is sgi >&5
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -33226,7 +32235,7 @@
# Check if it is a IBM compiler.
if test $CXX_ID = unknown; then
- echo "configure:33229:" checking if $CXX is xlc >&5
+ echo "configure:32238:" checking if $CXX is xlc >&5
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -33268,7 +32277,7 @@
else
btng_log_vars_value="unset";
fi
- echo "configure:33271:" "$btng_log_vars_index is $btng_log_vars_value" >&5;
+ echo "configure:32280:" "$btng_log_vars_index is $btng_log_vars_value" >&5;
done
@@ -34264,7 +33273,7 @@
# IBM does not have a method for supporting shared libraries
# Here is a kludge.
CXX_SHARED_LIB_UPDATE="`cd ${srcdir}/../config && pwd`/mklib.aix -o"
- echo "configure:34267:" CXX_SHARED_LIB_UPDATE changed to $CXX_SHARED_LIB_UPDATE especially for the IBM >&5
+ echo "configure:33276:" CXX_SHARED_LIB_UPDATE changed to $CXX_SHARED_LIB_UPDATE especially for the IBM >&5
fi
echo "$as_me:$LINENO: result: $CXX_STATIC_LIB_UPDATE and $CXX_SHARED_LIB_UPDATE" >&5
echo "${ECHO_T}$CXX_STATIC_LIB_UPDATE and $CXX_SHARED_LIB_UPDATE" >&6
@@ -41083,23 +40092,29 @@
if test "${with_QRose+set}" = set; then
withval="$with_QRose"
QROSE_PREFIX=$with_QRose
+else
+ with_QRose=no
fi;
if test "$with_QRose" != no; then
- USE_QROSE_TRUE=
- USE_QROSE_FALSE='#'
+ ROSE_USE_QROSE_TRUE=
+ ROSE_USE_QROSE_FALSE='#'
else
- USE_QROSE_TRUE='#'
- USE_QROSE_FALSE=
+ ROSE_USE_QROSE_TRUE='#'
+ ROSE_USE_QROSE_FALSE=
fi
-QROSE_LDFLAGS="-L${QROSE_PREFIX}/lib -lqrose"
-QROSE_CXXFLAGS="-I${QROSE_PREFIX}/include"
+#AM_CONDITIONAL(USE_QROSE, test "$with_QRose" != no)
+#QROSE_LDFLAGS="-L${QROSE_PREFIX}/lib -lqrose"
+#QROSE_CXXFLAGS="-I${QROSE_PREFIX}/include"
+#AC_SUBST(QROSE_LDFLAGS)
+#AC_SUBST(QROSE_CXXFLAGS)
+echo "with_QRose = $with_QRose"
echo "$as_me:$LINENO: checking for Qt" >&5
@@ -41110,7 +40125,8 @@
if test "${with_qt+set}" = set; then
withval="$with_qt"
ac_qt_path="$withval"
-
+else
+ with_qt=no
fi;
@@ -41143,7 +40159,7 @@
done
done
- if test "$with_QRose" != no && test "$qt_incdir" = NONE; then
+ if test "x$with_QRose" != xno && test "$qt_incdir" = NONE; then
{ { echo "$as_me:$LINENO: error: Qt headers not found, use --with-qt=DIR or --with-qt-includes=DIR" >&5
echo "$as_me: error: Qt headers not found, use --with-qt=DIR or --with-qt-includes=DIR" >&2;}
{ (exit 1); exit 1; }; }
@@ -41179,9 +40195,53 @@
+echo "$as_me:$LINENO: checking for windows" >&5
+echo $ECHO_N "checking for windows... $ECHO_C" >&6
+USING_MINGW32=0
+if test "$host_os" = cygwin; then
+ USING_WINDOWS=1
+ echo "$as_me:$LINENO: result: yes: cygwin. Use --build=mingw32 for dll library!" >&5
+echo "${ECHO_T}yes: cygwin. Use --build=mingw32 for dll library!" >&6
+else
+ if test "$host_os" = mingw32; then
+ USING_WINDOWS=1
+ USING_MINGW32=1
+ echo "$as_me:$LINENO: result: yes: mingw32" >&5
+echo "${ECHO_T}yes: mingw32" >&6
+ else
+ echo "$as_me:$LINENO: result: no: $host_os" >&5
+echo "${ECHO_T}no: $host_os" >&6
+ USING_WINDOWS=0
+ fi
+fi
+
+if test $USING_MINGW32 = 1; then
+ QROSE_USE_MINGW32_TRUE=
+ QROSE_USE_MINGW32_FALSE='#'
+else
+ QROSE_USE_MINGW32_TRUE='#'
+ QROSE_USE_MINGW32_FALSE=
+fi
+
+
+
+if test $USING_WINDOWS = 1; then
+ QROSE_USE_WINDOWS_TRUE=
+ QROSE_USE_WINDOWS_FALSE='#'
+else
+ QROSE_USE_WINDOWS_TRUE='#'
+ QROSE_USE_WINDOWS_FALSE=
+fi
+
+
+
+
+
+
+
# Check whether --with-qt-bin or --without-qt-bin was given.
if test "${with_qt_bin+set}" = set; then
withval="$with_qt_bin"
@@ -41237,17 +40297,43 @@
fi
+echo "with_qt = $with_qt"
+if test "$with_qt" != no; then
+ ROSE_USE_QT_TRUE=
+ ROSE_USE_QT_FALSE='#'
+else
+ ROSE_USE_QT_TRUE='#'
+ ROSE_USE_QT_FALSE=
+fi
+
+
+
+
subdirs="$subdirs src/3rdPartyLibraries/libltdl src/3rdPartyLibraries/libharu-2.1.0"
# RV 9/14/2005: Removed src/3rdPartyLibraries/PDFLibrary/Makefile
# JJW 1/30/2008: Removed rose_paths.h as it is now built by a separate Makefile included from $(top_srcdir)/Makefile.am
- !
ac_config_files="$ac_config_files stamp-h Makefile rose.docs config/Makefile src/Makefile src/util/Makefile src/util/stringSupport/Makefile src/util/commandlineProcessing/Makefile src/util/support/Makefile src/util/graphs/Makefile src/3rdPartyLibraries/Makefile src/3rdPartyLibraries/MSTL/Makefile src/3rdPartyLibraries/fortran-parser/Makefile src/3rdPartyLibraries/antlr-jars/Makefile src/ROSETTA/Makefile src/ROSETTA/src/Makefile src/frontend/Makefile src/frontend/SageIII/Makefile src/frontend/SageIII/sage.docs src/frontend/SageIII/astFixup/Makefile src/frontend/SageIII/astPostProcessing/Makefile src/frontend/SageIII/astFileIO/Makefile src/frontend/SageIII/astMerge/Makefile src/frontend/SageIII/sageInterface/Makefile src/frontend/SageIII/virtualCFG/Makefile src/frontend/SageIII/astTokenStream/Makefile src/frontend/SageIII/astHiddenTypeAndDeclarationLists/Makefile src/frontend/SageIII/astVisualization/Makefile src/frontend/CxxFrontend/Makefile src/frontend/OpenFortranParser_SAGE_Connection/Makefile src/frontend/PHPFrontend/Makefile src/frontend/BinaryDisassembly/Makefile src/fronte!
nd/Disas
semblers/Makefile src/frontend/ExecFormats/Makefile src/midend/Makefile src/midend/astInlining/Makefile src/midend/astOutlining/Makefile src/midend/astUtil/Makefile src/midend/astUtil/astInterface/Makefile src/midend/astUtil/astSupport/Makefile src/midend/astUtil/symbolicVal/Makefile src/midend/astUtil/annotation/Makefile src/midend/astQuery/Makefile src/midend/astProcessing/Makefile src/midend/astRewriteMechanism/Makefile src/midend/astDiagnostics/Makefile src/midend/programAnalysis/Makefile src/midend/programAnalysis/CallGraphAnalysis/Makefile src/midend/programAnalysis/OAWrap/Makefile src/midend/programAnalysis/CFG/Makefile src/midend/programAnalysis/dataflowAnalysis/Makefile src/midend/programAnalysis/pointerAnal/Makefile src/midend/programAnalysis/valuePropagation/Makefile src/midend/programAnalysis/defUseAnalysis/Makefile src/midend/programAnalysis/dominanceAnalysis/Makefile src/midend/programAnalysis/staticInterproceduralSlicing/Makefile src/midend/programAnalysis/annotationLanguageParser/Makefile src/midend/programAnalysis/sideEffectAnalysis/Makefile src/midend/programAnalysis/distributedMemoryAnalysis/Makefile src/midend/programTransformation/Makefile src/midend/programTransformation/partialRedundancyElimination/Makefile src/midend/programTransformation/finiteDifferencing/Makefile src/midend/programTransformation/functionCallNormalization/Makefile src/midend/programTransformation/constantFolding/Makefile src/midend/programTransformation/implicitCodeGeneration/Makefile src/midend/programTransformation/runtimeTransformation/Makefile src/midend/loopProcessing/Makefile src/midend/loopProcessing/prepostTransformation/Makefile src/midend/loopProcessing/depInfo/Makefile src/midend/loopProcessing/depGraph/Makefile src/midend/loopProcessing/computation/Makefile src/midend/loopProcessing/slicing/Makefile src/midend/loopProcessing/driver/Makefile src/backend/Makefile src/backend/unparser/Makefile src/backend/unparser/formatSupport/Makefile src/backend/unparser/languageIndependenceSupport/Makefile src/backe!
nd/unpar
ser/CxxCodeGeneration/Makefile src/backend/unparser/FortranCodeGeneration/Makefile src/backend/unparser/PHPCodeGeneration/Makefile src/backend/asmUnparser/Makefile src/roseSupport/Makefile src/roseExtensions/Makefile src/roseExtensions/SQLiteConnection/Makefile src/roseExtensions/sqlite3x/Makefile src/roseExtensions/databaseConnection/Makefile src/roseExtensions/databaseConnection/GlobalDatabaseConnection.C src/roseExtensions/dataStructureTraversal/Makefile src/roseExtensions/highLevelGrammar/Makefile src/roseExtensions/roseHPCToolkit/Makefile src/roseExtensions/roseHPCToolkit/src/Makefile src/roseExtensions/roseHPCToolkit/include/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/Makefile src/roseExtensions/roseHPCToolkit/src/util/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/util/Makefile src/roseExtensions/roseHPCToolkit/src/xml/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/xml/Makefile src/roseExtensions/roseHPCToolkit/src/xml-xercesc/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/xml-xercesc/Makefile src/roseExtensions/roseHPCToolkit/src/profir/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/profir/Makefile src/roseExtensions/roseHPCToolkit/src/xml2profir/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/xml2profir/Makefile src/roseExtensions/roseHPCToolkit/src/sage/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/sage/Makefile src/roseExtensions/roseHPCToolkit/src/profir2sage/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/profir2sage/Makefile src/roseExtensions/roseHPCToolkit/docs/Makefile src/roseIndependentSupport/Makefile src/roseIndependentSupport/dot2gml/Makefile src/roseIndependentSupport/graphicalUserInterface/Makefile src/roseIndependentSupport/graphicalUserInterface/src/Makefile src/roseIndependentSupport/graphicalUserInterface/src/QRTree/Makefile src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox/Makefile src/roseIndependentSupport/graphicalUserInterface/src/QRGui/Makefile src/rose!
Independ
entSupport/graphicalUserInterface/src/QRGui/icons22/Makefile src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox/Makefile projects/Makefile projects/compass/Makefile projects/compass/src/Makefile projects/compass/src/compassSupport/Makefile projects/compass/src/util/Makefile projects/compass/src/util/C-API/Makefile projects/compass/src/util/MPIAbstraction/Makefile projects/compass/src/util/MPIAbstraction/alt-mpi-headers/Makefile projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/Makefile projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/include/Makefile projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/include/mpi2c++/Makefile projects/compass/tools/Makefile projects/compass/tools/compass/Makefile projects/compass/tools/compass/doc/compass.tex projects/compass/tools/compass/gui/Makefile projects/compass/tools/compass/doc/Makefile projects/compass/tools/compass/tests/Makefile projects/compass/tools/compass/tests/C_tests/Makefile projects/compass/tools/compass/tests/Cxx_tests/Makefile projects/compass/tools/sampleCompassSubset/Makefile projects/compass/tools/compassVerifier/Makefile projects/BinaryCloneDetection/Makefile projects/binCompass/Makefile projects/binCompass/analyses/Makefile projects/binCompass/graphanalyses/Makefile projects/binaryVisualization/Makefile projects/highLevelGrammars/Makefile projects/BabelPreprocessor/Makefile projects/checkPointExample/Makefile projects/simpleCallGraphAnalysis/Makefile projects/CloneDetection/Makefile projects/arrayOptimization/Makefile projects/arrayOptimization/test/Makefile projects/dataStructureGraphing/Makefile projects/programModeling/Makefile projects/FiniteStateModelChecker/Makefile projects/DatalogAnalysis/Makefile projects/DatalogAnalysis/src/Makefile projects/DatalogAnalysis/src/DBFactories/Makefile projects/DatalogAnalysis/relationTranslatorGenerator/Makefile projects/DatalogAnalysis/tests/Makefile projects/DistributedMemoryAnalysisCompass/Makefile projects/DocumentationGenera!
tor/Make
file projects/runtimeErrorCheck/Makefile projects/C_to_Promela/Makefile projects/OpenMP_Translator/Makefile projects/OpenMP_Translator/tests/Makefile projects/OpenMP_Translator/tests/cvalidationsuite/Makefile projects/OpenMP_Translator/tests/developmentTests/Makefile projects/OpenMP_Translator/tests/epcc-c/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/BT/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/CG/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/EP/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/FT/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/IS/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/LU/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/MG/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/SP/Makefile projects/MPICodeMotion/Makefile projects/javaport/Makefile projects/palette/Makefile projects/reverseComputation/Makefile projects/BinaryContextLookup/Makefile projects/assemblyToSourceAst/Makefile projects/bugSeeding/Makefile projects/bugSeeding/bugSeeding.tex projects/UpcTranslation/Makefile projects/UpcTranslation/tests/Makefile tests/Makefile tests/RunTests/Makefile tests/RunTests/A++Tests/Makefile tests/PerformanceTests/Makefile tests/CompilerOptionsTests/Makefile tests/CompilerOptionsTests/testCpreprocessorOption/Makefile tests/CompilerOptionsTests/testForSpuriousOutput/Makefile tests/CompilerOptionsTests/testHeaderFileOutput/Makefile tests/CompilerOptionsTests/testOutputFileOption/Makefile tests/CompilerOptionsTests/testFileNamesAndExtensions/Makefile tests/CompilerOptionsTests/testFileNamesAndExtensions/fileNames/Makefile tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/Makefile tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseInsensitive/Makefile tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseSensitive/Makefile tests/CompileTests/Makefile tests/CompileTests/A++Tests/Makefile tests/CompileTests/P++Tests/Make!
file tes
ts/CompileTests/A++Code/Makefile tests/CompileTests/OvertureCode/Makefile tests/CompileTests/ElsaTestCases/Makefile tests/CompileTests/ElsaTestCases/ctests/Makefile tests/CompileTests/ElsaTestCases/gnu/Makefile tests/CompileTests/ElsaTestCases/kandr/Makefile tests/CompileTests/ElsaTestCases/std/Makefile tests/CompileTests/C_tests/Makefile tests/CompileTests/C99_tests/Makefile tests/CompileTests/Cxx_tests/Makefile tests/CompileTests/C_subset_of_Cxx_tests/Makefile tests/CompileTests/Fortran_tests/Makefile tests/CompileTests/RoseExample_tests/Makefile tests/CompileTests/ExpressionTemplateExample_tests/Makefile tests/CompileTests/PythonExample_tests/Makefile tests/CompileTests/UPC_tests/Makefile tests/CompileTests/copyAST_tests/Makefile tests/CompileTests/colorAST_tests/Makefile tests/CompileTests/mergeAST_tests/Makefile tests/CompileTests/unparseToString_tests/Makefile tests/CompileTests/OpenMP_C_tests/Makefile tests/CompileTests/boost_tests/Makefile tests/CompileTests/virtualCFG_tests/Makefile tests/CompileTests/uninitializedField_tests/Makefile tests/CompileTests/sourcePosition_tests/Makefile tests/CompileTests/hiddenTypeAndDeclarationListTests/Makefile tests/roseTests/Makefile tests/roseTests/astSymbolTableTests/Makefile tests/roseTests/astQueryTests/Makefile tests/roseTests/astInliningTests/Makefile tests/roseTests/astOutliningTests/Makefile tests/roseTests/astOutliningTests/fortranTests/Makefile tests/roseTests/utilTests/Makefile tests/roseTests/astRewriteTests/Makefile tests/roseTests/loopProcessingTests/Makefile tests/roseTests/programAnalysisTests/Makefile tests/roseTests/programAnalysisTests/defUseAnalysisTests/Makefile tests/roseTests/programAnalysisTests/staticInterproceduralSlicingTests/Makefile tests/roseTests/programAnalysisTests/testCallGraphAnalysis/Makefile tests/roseTests/programAnalysisTests/sideEffectAnalysisTests/Makefile tests/roseTests/programTransformationTests/Makefile tests/roseTests/astMergeTests/Makefile tests/roseTests/astPerformanceTests/Makefile tests/roseTests/astFileIOTests/!
Makefile
tests/roseTests/astProcessingTests/Makefile tests/roseTests/roseHPCToolkitTests/Makefile tests/roseTests/roseHPCToolkitTests/data/Makefile tests/roseTests/roseHPCToolkitTests/data/01/Makefile tests/roseTests/roseHPCToolkitTests/data/01/ANALYSIS/Makefile tests/roseTests/roseHPCToolkitTests/data/01/PROFILE/Makefile tests/roseTests/roseHPCToolkitTests/data/01/PROGRAM/Makefile tests/roseTests/roseHPCToolkitTests/data/02/Makefile tests/roseTests/roseHPCToolkitTests/data/02/PROFILE/Makefile tests/roseTests/roseHPCToolkitTests/data/02/struct_ls/Makefile tests/roseTests/roseHPCToolkitTests/data/03/Makefile tests/roseTests/roseHPCToolkitTests/data/03/PROFILE/Makefile tests/roseTests/roseHPCToolkitTests/data/03/struct_ls/Makefile tests/roseTests/astInterfaceTests/Makefile tests/roseTests/binaryTests/Makefile tests/roseTests/PHPTests/Makefile tests/translatorTests/Makefile tutorial/Makefile tutorial/exampleMakefile tutorial/database/Makefile tutorial/roseHPCT/Makefile tutorial/outliner/Makefile exampleTranslators/Makefile exampleTranslators/AstCopyReplTester/Makefile exampleTranslators/DOTGenerator/Makefile exampleTranslators/PDFGenerator/Makefile exampleTranslators/documentedExamples/Makefile exampleTranslators/documentedExamples/simpleTranslatorExamples/Makefile exampleTranslators/documentedExamples/simpleTranslatorExamples/exampleMakefile exampleTranslators/documentedExamples/AstRewriteExamples/Makefile exampleTranslators/documentedExamples/dataBaseExamples/Makefile exampleTranslators/defaultTranslator/Makefile exampleTranslators/graphicalUserInterfaceExamples/Makefile exampleTranslators/graphicalUserInterfaceExamples/slicing/Makefile exampleTranslators/graphicalUserInterfaceExamples/attributes/Makefile exampleTranslators/graphicalUserInterfaceExamples/query/Makefile exampleTranslators/graphicalUserInterfaceExamples/layout/Makefile docs/Makefile docs/Rose/rose.html docs/Rose/projects.html docs/Rose/AvailableDocumentation.docs docs/Rose/Makefile docs/Rose/manual.tex docs/Rose/ROSE_InstallationInstructions.tex do!
cs/Rose/
gettingStarted.tex docs/Rose/rose.cfg docs/Rose/sage.cfg docs/Rose/Tutorial/Makefile docs/Rose/Tutorial/tutorial.tex docs/Rose/Tutorial/gettingStarted.tex tools/Makefile scripts/Makefile"
+ !
ac_config_files="$ac_config_files stamp-h Makefile rose.docs config/Makefile src/Makefile src/util/Makefile src/util/stringSupport/Makefile src/util/commandlineProcessing/Makefile src/util/support/Makefile src/util/graphs/Makefile src/3rdPartyLibraries/Makefile src/3rdPartyLibraries/MSTL/Makefile src/3rdPartyLibraries/fortran-parser/Makefile src/3rdPartyLibraries/antlr-jars/Makefile src/ROSETTA/Makefile src/ROSETTA/src/Makefile src/frontend/Makefile src/frontend/SageIII/Makefile src/frontend/SageIII/sage.docs src/frontend/SageIII/astFixup/Makefile src/frontend/SageIII/astPostProcessing/Makefile src/frontend/SageIII/astFileIO/Makefile src/frontend/SageIII/astMerge/Makefile src/frontend/SageIII/sageInterface/Makefile src/frontend/SageIII/virtualCFG/Makefile src/frontend/SageIII/astTokenStream/Makefile src/frontend/SageIII/astHiddenTypeAndDeclarationLists/Makefile src/frontend/SageIII/astVisualization/Makefile src/frontend/CxxFrontend/Makefile src/frontend/OpenFortranParser_SAGE_Connection/Makefile src/frontend/PHPFrontend/Makefile src/frontend/BinaryDisassembly/Makefile src/frontend/Disassemblers/Makefile src/frontend/ExecFormats/Makefile src/midend/Makefile src/midend/astInlining/Makefil!
e src/mi
dend/astOutlining/Makefile src/midend/astUtil/Makefile src/midend/astUtil/astInterface/Makefile src/midend/astUtil/astSupport/Makefile src/midend/astUtil/symbolicVal/Makefile src/midend/astUtil/annotation/Makefile src/midend/astQuery/Makefile src/midend/astProcessing/Makefile src/midend/astRewriteMechanism/Makefile src/midend/astDiagnostics/Makefile src/midend/programAnalysis/Makefile src/midend/programAnalysis/CallGraphAnalysis/Makefile src/midend/programAnalysis/OAWrap/Makefile src/midend/programAnalysis/CFG/Makefile src/midend/programAnalysis/dataflowAnalysis/Makefile src/midend/programAnalysis/pointerAnal/Makefile src/midend/programAnalysis/valuePropagation/Makefile src/midend/programAnalysis/defUseAnalysis/Makefile src/midend/programAnalysis/dominanceAnalysis/Makefile src/midend/programAnalysis/staticInterproceduralSlicing/Makefile src/midend/programAnalysis/annotationLanguageParser/Makefile src/midend/programAnalysis/sideEffectAnalysis/Makefile src/midend/programAnalysis/distributedMemoryAnalysis/Makefile src/midend/programTransformation/Makefile src/midend/programTransformation/partialRedundancyElimination/Makefile src/midend/programTransformation/finiteDifferencing/Makefile src/midend/programTransformation/functionCallNormalization/Makefile src/midend/programTransformation/constantFolding/Makefile src/midend/programTransformation/implicitCodeGeneration/Makefile src/midend/programTransformation/runtimeTransformation/Makefile src/midend/loopProcessing/Makefile src/midend/loopProcessing/prepostTransformation/Makefile src/midend/loopProcessing/depInfo/Makefile src/midend/loopProcessing/depGraph/Makefile src/midend/loopProcessing/computation/Makefile src/midend/loopProcessing/slicing/Makefile src/midend/loopProcessing/driver/Makefile src/backend/Makefile src/backend/unparser/Makefile src/backend/unparser/formatSupport/Makefile src/backend/unparser/languageIndependenceSupport/Makefile src/backend/unparser/CxxCodeGeneration/Makefile src/backend/unparser/FortranCodeGeneration/Makefile src/backend/unparse!
r/PHPCod
eGeneration/Makefile src/backend/asmUnparser/Makefile src/roseSupport/Makefile src/roseExtensions/Makefile src/roseExtensions/SQLiteConnection/Makefile src/roseExtensions/sqlite3x/Makefile src/roseExtensions/databaseConnection/Makefile src/roseExtensions/databaseConnection/GlobalDatabaseConnection.C src/roseExtensions/dataStructureTraversal/Makefile src/roseExtensions/highLevelGrammar/Makefile src/roseExtensions/roseHPCToolkit/Makefile src/roseExtensions/roseHPCToolkit/src/Makefile src/roseExtensions/roseHPCToolkit/include/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/Makefile src/roseExtensions/roseHPCToolkit/src/util/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/util/Makefile src/roseExtensions/roseHPCToolkit/src/xml/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/xml/Makefile src/roseExtensions/roseHPCToolkit/src/xml-xercesc/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/xml-xercesc/Makefile src/roseExtensions/roseHPCToolkit/src/profir/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/profir/Makefile src/roseExtensions/roseHPCToolkit/src/xml2profir/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/xml2profir/Makefile src/roseExtensions/roseHPCToolkit/src/sage/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/sage/Makefile src/roseExtensions/roseHPCToolkit/src/profir2sage/Makefile src/roseExtensions/roseHPCToolkit/include/rosehpct/profir2sage/Makefile src/roseExtensions/roseHPCToolkit/docs/Makefile src/roseIndependentSupport/Makefile src/roseIndependentSupport/dot2gml/Makefile projects/Makefile projects/compass/Makefile projects/compass/src/Makefile projects/compass/src/compassSupport/Makefile projects/compass/src/util/Makefile projects/compass/src/util/C-API/Makefile projects/compass/src/util/MPIAbstraction/Makefile projects/compass/src/util/MPIAbstraction/alt-mpi-headers/Makefile projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/Makefile projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpic!
h-1.2.7p
1/include/Makefile projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/include/mpi2c++/Makefile projects/compass/tools/Makefile projects/compass/tools/compass/Makefile projects/compass/tools/compass/doc/compass.tex projects/compass/tools/compass/gui/Makefile projects/compass/tools/compass/doc/Makefile projects/compass/tools/compass/tests/Makefile projects/compass/tools/compass/tests/C_tests/Makefile projects/compass/tools/compass/tests/Cxx_tests/Makefile projects/compass/tools/sampleCompassSubset/Makefile projects/compass/tools/compassVerifier/Makefile projects/BinaryCloneDetection/Makefile projects/BinaryCloneDetection/gui/Makefile projects/binCompass/Makefile projects/binCompass/analyses/Makefile projects/binCompass/graphanalyses/Makefile projects/binaryVisualization/Makefile projects/highLevelGrammars/Makefile projects/BabelPreprocessor/Makefile projects/checkPointExample/Makefile projects/simpleCallGraphAnalysis/Makefile projects/CloneDetection/Makefile projects/arrayOptimization/Makefile projects/arrayOptimization/test/Makefile projects/dataStructureGraphing/Makefile projects/programModeling/Makefile projects/FiniteStateModelChecker/Makefile projects/DatalogAnalysis/Makefile projects/DatalogAnalysis/src/Makefile projects/DatalogAnalysis/src/DBFactories/Makefile projects/DatalogAnalysis/relationTranslatorGenerator/Makefile projects/DatalogAnalysis/tests/Makefile projects/DistributedMemoryAnalysisCompass/Makefile projects/DocumentationGenerator/Makefile projects/runtimeErrorCheck/Makefile projects/C_to_Promela/Makefile projects/OpenMP_Translator/Makefile projects/OpenMP_Translator/tests/Makefile projects/OpenMP_Translator/tests/cvalidationsuite/Makefile projects/OpenMP_Translator/tests/developmentTests/Makefile projects/OpenMP_Translator/tests/epcc-c/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/BT/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/CG/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/EP/Makefil!
e projec
ts/OpenMP_Translator/tests/npb2.3-omp-c/FT/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/IS/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/LU/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/MG/Makefile projects/OpenMP_Translator/tests/npb2.3-omp-c/SP/Makefile projects/MPICodeMotion/Makefile projects/javaport/Makefile projects/palette/Makefile projects/reverseComputation/Makefile projects/BinaryContextLookup/Makefile projects/assemblyToSourceAst/Makefile projects/bugSeeding/Makefile projects/bugSeeding/bugSeeding.tex projects/UpcTranslation/Makefile projects/UpcTranslation/tests/Makefile tests/Makefile tests/RunTests/Makefile tests/RunTests/A++Tests/Makefile tests/PerformanceTests/Makefile tests/CompilerOptionsTests/Makefile tests/CompilerOptionsTests/testCpreprocessorOption/Makefile tests/CompilerOptionsTests/testForSpuriousOutput/Makefile tests/CompilerOptionsTests/testHeaderFileOutput/Makefile tests/CompilerOptionsTests/testOutputFileOption/Makefile tests/CompilerOptionsTests/testFileNamesAndExtensions/Makefile tests/CompilerOptionsTests/testFileNamesAndExtensions/fileNames/Makefile tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/Makefile tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseInsensitive/Makefile tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseSensitive/Makefile tests/CompileTests/Makefile tests/CompileTests/A++Tests/Makefile tests/CompileTests/P++Tests/Makefile tests/CompileTests/A++Code/Makefile tests/CompileTests/OvertureCode/Makefile tests/CompileTests/ElsaTestCases/Makefile tests/CompileTests/ElsaTestCases/ctests/Makefile tests/CompileTests/ElsaTestCases/gnu/Makefile tests/CompileTests/ElsaTestCases/kandr/Makefile tests/CompileTests/ElsaTestCases/std/Makefile tests/CompileTests/C_tests/Makefile tests/CompileTests/C99_tests/Makefile tests/CompileTests/Cxx_tests/Makefile tests/CompileTests/C_subset_of_Cxx_tests/Makefile tests/CompileTests/Fortran_tests/Makefile tests/CompileTests/RoseExample_test!
s/Makefi
le tests/CompileTests/ExpressionTemplateExample_tests/Makefile tests/CompileTests/PythonExample_tests/Makefile tests/CompileTests/UPC_tests/Makefile tests/CompileTests/copyAST_tests/Makefile tests/CompileTests/colorAST_tests/Makefile tests/CompileTests/mergeAST_tests/Makefile tests/CompileTests/unparseToString_tests/Makefile tests/CompileTests/OpenMP_C_tests/Makefile tests/CompileTests/boost_tests/Makefile tests/CompileTests/virtualCFG_tests/Makefile tests/CompileTests/uninitializedField_tests/Makefile tests/CompileTests/sourcePosition_tests/Makefile tests/CompileTests/hiddenTypeAndDeclarationListTests/Makefile tests/roseTests/Makefile tests/roseTests/astSymbolTableTests/Makefile tests/roseTests/astQueryTests/Makefile tests/roseTests/astInliningTests/Makefile tests/roseTests/astOutliningTests/Makefile tests/roseTests/astOutliningTests/fortranTests/Makefile tests/roseTests/utilTests/Makefile tests/roseTests/astRewriteTests/Makefile tests/roseTests/loopProcessingTests/Makefile tests/roseTests/programAnalysisTests/Makefile tests/roseTests/programAnalysisTests/defUseAnalysisTests/Makefile tests/roseTests/programAnalysisTests/staticInterproceduralSlicingTests/Makefile tests/roseTests/programAnalysisTests/testCallGraphAnalysis/Makefile tests/roseTests/programAnalysisTests/sideEffectAnalysisTests/Makefile tests/roseTests/programTransformationTests/Makefile tests/roseTests/astMergeTests/Makefile tests/roseTests/astPerformanceTests/Makefile tests/roseTests/astFileIOTests/Makefile tests/roseTests/astProcessingTests/Makefile tests/roseTests/roseHPCToolkitTests/Makefile tests/roseTests/roseHPCToolkitTests/data/Makefile tests/roseTests/roseHPCToolkitTests/data/01/Makefile tests/roseTests/roseHPCToolkitTests/data/01/ANALYSIS/Makefile tests/roseTests/roseHPCToolkitTests/data/01/PROFILE/Makefile tests/roseTests/roseHPCToolkitTests/data/01/PROGRAM/Makefile tests/roseTests/roseHPCToolkitTests/data/02/Makefile tests/roseTests/roseHPCToolkitTests/data/02/PROFILE/Makefile tests/roseTests/roseHPCToolkitTests/data/02/struct_ls!
/Makefil
e tests/roseTests/roseHPCToolkitTests/data/03/Makefile tests/roseTests/roseHPCToolkitTests/data/03/PROFILE/Makefile tests/roseTests/roseHPCToolkitTests/data/03/struct_ls/Makefile tests/roseTests/astInterfaceTests/Makefile tests/roseTests/binaryTests/Makefile tests/roseTests/PHPTests/Makefile tests/translatorTests/Makefile tutorial/Makefile tutorial/exampleMakefile tutorial/database/Makefile tutorial/roseHPCT/Makefile tutorial/outliner/Makefile exampleTranslators/Makefile exampleTranslators/AstCopyReplTester/Makefile exampleTranslators/DOTGenerator/Makefile exampleTranslators/PDFGenerator/Makefile exampleTranslators/documentedExamples/Makefile exampleTranslators/documentedExamples/simpleTranslatorExamples/Makefile exampleTranslators/documentedExamples/simpleTranslatorExamples/exampleMakefile exampleTranslators/documentedExamples/AstRewriteExamples/Makefile exampleTranslators/documentedExamples/dataBaseExamples/Makefile exampleTranslators/defaultTranslator/Makefile docs/Makefile docs/Rose/rose.html docs/Rose/projects.html docs/Rose/AvailableDocumentation.docs docs/Rose/Makefile docs/Rose/manual.tex docs/Rose/ROSE_InstallationInstructions.tex docs/Rose/gettingStarted.tex docs/Rose/rose.cfg docs/Rose/sage.cfg docs/Rose/Tutorial/Makefile docs/Rose/Tutorial/tutorial.tex docs/Rose/Tutorial/gettingStarted.tex tools/Makefile scripts/Makefile"
+# DQ (9/12/2008): Removed older version of QRose (now an external project)
+# src/roseIndependentSupport/graphicalUserInterface/Makefile
+# src/roseIndependentSupport/graphicalUserInterface/src/Makefile
+# src/roseIndependentSupport/graphicalUserInterface/src/QRTree/Makefile
+# src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox/Makefile
+# src/roseIndependentSupport/graphicalUserInterface/src/QRGui/Makefile
+# src/roseIndependentSupport/graphicalUserInterface/src/QRGui/icons22/Makefile
+# src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox/Makefile
+# exampleTranslators/graphicalUserInterfaceExamples/Makefile
+# exampleTranslators/graphicalUserInterfaceExamples/slicing/Makefile
+# exampleTranslators/graphicalUserInterfaceExamples/attributes/Makefile
+# exampleTranslators/graphicalUserInterfaceExamples/query/Makefile
+# exampleTranslators/graphicalUserInterfaceExamples/layout/Makefile
+
ac_config_commands="$ac_config_commands default"
@@ -41349,13 +40435,6 @@
LTLIBOBJS=$ac_ltlibobjs
-if test -z "${ROSE_USE_QROSE_TRUE}" && test -z "${ROSE_USE_QROSE_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ROSE_USE_QROSE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"ROSE_USE_QROSE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
if test -z "${DOT_TO_GML_TRANSLATOR_TRUE}" && test -z "${DOT_TO_GML_TRANSLATOR_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"DOT_TO_GML_TRANSLATOR\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -41370,55 +40449,20 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${QROSE_USE_MINGW32_TRUE}" && test -z "${QROSE_USE_MINGW32_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"QROSE_USE_MINGW32\" was never defined.
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"QROSE_USE_MINGW32\" was never defined.
+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${QROSE_USE_WINDOWS_TRUE}" && test -z "${QROSE_USE_WINDOWS_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"QROSE_USE_WINDOWS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"QROSE_USE_WINDOWS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${PNG_TRUE}" && test -z "${PNG_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"PNG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"PNG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${JPEG_TRUE}" && test -z "${JPEG_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"JPEG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"JPEG\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${ROSE_USE_QROSE_TRUE}" && test -z "${ROSE_USE_QROSE_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ROSE_USE_QROSE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"ROSE_USE_QROSE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
if test -z "${ROSE_USE_BOOST_WAVE_TRUE}" && test -z "${ROSE_USE_BOOST_WAVE_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"ROSE_USE_BOOST_WAVE\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -41629,13 +40673,34 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${USE_QROSE_TRUE}" && test -z "${USE_QROSE_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"USE_QROSE\" was never defined.
+if test -z "${ROSE_USE_QROSE_TRUE}" && test -z "${ROSE_USE_QROSE_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"ROSE_USE_QROSE\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_QROSE\" was never defined.
+echo "$as_me: error: conditional \"ROSE_USE_QROSE\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${QROSE_USE_MINGW32_TRUE}" && test -z "${QROSE_USE_MINGW32_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"QROSE_USE_MINGW32\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"QROSE_USE_MINGW32\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${QROSE_USE_WINDOWS_TRUE}" && test -z "${QROSE_USE_WINDOWS_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"QROSE_USE_WINDOWS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"QROSE_USE_WINDOWS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${ROSE_USE_QT_TRUE}" && test -z "${ROSE_USE_QT_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"ROSE_USE_QT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"ROSE_USE_QT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -42192,13 +41257,6 @@
"src/roseExtensions/roseHPCToolkit/docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/roseExtensions/roseHPCToolkit/docs/Makefile" ;;
"src/roseIndependentSupport/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/roseIndependentSupport/Makefile" ;;
"src/roseIndependentSupport/dot2gml/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/roseIndependentSupport/dot2gml/Makefile" ;;
- "src/roseIndependentSupport/graphicalUserInterface/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/roseIndependentSupport/graphicalUserInterface/Makefile" ;;
- "src/roseIndependentSupport/graphicalUserInterface/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/roseIndependentSupport/graphicalUserInterface/src/Makefile" ;;
- "src/roseIndependentSupport/graphicalUserInterface/src/QRTree/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/roseIndependentSupport/graphicalUserInterface/src/QRTree/Makefile" ;;
- "src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox/Makefile" ;;
- "src/roseIndependentSupport/graphicalUserInterface/src/QRGui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/roseIndependentSupport/graphicalUserInterface/src/QRGui/Makefile" ;;
- "src/roseIndependentSupport/graphicalUserInterface/src/QRGui/icons22/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/roseIndependentSupport/graphicalUserInterface/src/QRGui/icons22/Makefile" ;;
- "src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox/Makefile" ;;
"projects/Makefile" ) CONFIG_FILES="$CONFIG_FILES projects/Makefile" ;;
"projects/compass/Makefile" ) CONFIG_FILES="$CONFIG_FILES projects/compass/Makefile" ;;
"projects/compass/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES projects/compass/src/Makefile" ;;
@@ -42221,6 +41279,7 @@
"projects/compass/tools/sampleCompassSubset/Makefile" ) CONFIG_FILES="$CONFIG_FILES projects/compass/tools/sampleCompassSubset/Makefile" ;;
"projects/compass/tools/compassVerifier/Makefile" ) CONFIG_FILES="$CONFIG_FILES projects/compass/tools/compassVerifier/Makefile" ;;
"projects/BinaryCloneDetection/Makefile" ) CONFIG_FILES="$CONFIG_FILES projects/BinaryCloneDetection/Makefile" ;;
+ "projects/BinaryCloneDetection/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES projects/BinaryCloneDetection/gui/Makefile" ;;
"projects/binCompass/Makefile" ) CONFIG_FILES="$CONFIG_FILES projects/binCompass/Makefile" ;;
"projects/binCompass/analyses/Makefile" ) CONFIG_FILES="$CONFIG_FILES projects/binCompass/analyses/Makefile" ;;
"projects/binCompass/graphanalyses/Makefile" ) CONFIG_FILES="$CONFIG_FILES projects/binCompass/graphanalyses/Makefile" ;;
@@ -42361,11 +41420,6 @@
"exampleTranslators/documentedExamples/AstRewriteExamples/Makefile" ) CONFIG_FILES="$CONFIG_FILES exampleTranslators/documentedExamples/AstRewriteExamples/Makefile" ;;
"exampleTranslators/documentedExamples/dataBaseExamples/Makefile" ) CONFIG_FILES="$CONFIG_FILES exampleTranslators/documentedExamples/dataBaseExamples/Makefile" ;;
"exampleTranslators/defaultTranslator/Makefile" ) CONFIG_FILES="$CONFIG_FILES exampleTranslators/defaultTranslator/Makefile" ;;
- "exampleTranslators/graphicalUserInterfaceExamples/Makefile" ) CONFIG_FILES="$CONFIG_FILES exampleTranslators/graphicalUserInterfaceExamples/Makefile" ;;
- "exampleTranslators/graphicalUserInterfaceExamples/slicing/Makefile" ) CONFIG_FILES="$CONFIG_FILES exampleTranslators/graphicalUserInterfaceExamples/slicing/Makefile" ;;
- "exampleTranslators/graphicalUserInterfaceExamples/attributes/Makefile" ) CONFIG_FILES="$CONFIG_FILES exampleTranslators/graphicalUserInterfaceExamples/attributes/Makefile" ;;
- "exampleTranslators/graphicalUserInterfaceExamples/query/Makefile" ) CONFIG_FILES="$CONFIG_FILES exampleTranslators/graphicalUserInterfaceExamples/query/Makefile" ;;
- "exampleTranslators/graphicalUserInterfaceExamples/layout/Makefile" ) CONFIG_FILES="$CONFIG_FILES exampleTranslators/graphicalUserInterfaceExamples/layout/Makefile" ;;
"docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
"docs/Rose/rose.html" ) CONFIG_FILES="$CONFIG_FILES docs/Rose/rose.html" ;;
"docs/Rose/projects.html" ) CONFIG_FILES="$CONFIG_FILES docs/Rose/projects.html" ;;
@@ -42493,8 +41547,6 @@
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
s, at configure_date@,$configure_date,;t t
-s, at ROSE_USE_QROSE_TRUE@,$ROSE_USE_QROSE_TRUE,;t t
-s, at ROSE_USE_QROSE_FALSE@,$ROSE_USE_QROSE_FALSE,;t t
s, at DOT_TO_GML_TRANSLATOR_TRUE@,$DOT_TO_GML_TRANSLATOR_TRUE,;t t
s, at DOT_TO_GML_TRANSLATOR_FALSE@,$DOT_TO_GML_TRANSLATOR_FALSE,;t t
s, at build@,$build,;t t
@@ -42506,11 +41558,11 @@
s, at host_vendor@,$host_vendor,;t t
s, at host_os@,$host_os,;t t
s, at ROSE_HOME@,$ROSE_HOME,;t t
-s, at CC@,$CC,;t t
-s, at CFLAGS@,$CFLAGS,;t t
+s, at CXX@,$CXX,;t t
+s, at CXXFLAGS@,$CXXFLAGS,;t t
s, at LDFLAGS@,$LDFLAGS,;t t
s, at CPPFLAGS@,$CPPFLAGS,;t t
-s, at ac_ct_CC@,$ac_ct_CC,;t t
+s, at ac_ct_CXX@,$ac_ct_CXX,;t t
s, at EXEEXT@,$EXEEXT,;t t
s, at OBJEXT@,$OBJEXT,;t t
s, at DEPDIR@,$DEPDIR,;t t
@@ -42519,37 +41571,18 @@
s, at AMDEP_TRUE@,$AMDEP_TRUE,;t t
s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t
s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-s, at CCDEPMODE@,$CCDEPMODE,;t t
-s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s, at CPP@,$CPP,;t t
-s, at QT_INCLUDES@,$QT_INCLUDES,;t t
-s, at QT_LDFLAGS@,$QT_LDFLAGS,;t t
-s, at USING_WINDOWS@,$USING_WINDOWS,;t t
-s, at QROSE_USE_MINGW32_TRUE@,$QROSE_USE_MINGW32_TRUE,;t t
-s, at QROSE_USE_MINGW32_FALSE@,$QROSE_USE_MINGW32_FALSE,;t t
-s, at QROSE_USE_WINDOWS_TRUE@,$QROSE_USE_WINDOWS_TRUE,;t t
-s, at QROSE_USE_WINDOWS_FALSE@,$QROSE_USE_WINDOWS_FALSE,;t t
-s, at MOC@,$MOC,;t t
-s, at gl_libraries@,$gl_libraries,;t t
-s, at gl_includes@,$gl_includes,;t t
-s, at GL_INCLUDES@,$GL_INCLUDES,;t t
-s, at GL_LDFLAGS@,$GL_LDFLAGS,;t t
-s, at LIB_GL@,$LIB_GL,;t t
-s, at LIB_IMAGES_LDFLAGS@,$LIB_IMAGES_LDFLAGS,;t t
-s, at PNG_TRUE@,$PNG_TRUE,;t t
-s, at PNG_FALSE@,$PNG_FALSE,;t t
-s, at JPEG_TRUE@,$JPEG_TRUE,;t t
-s, at JPEG_FALSE@,$JPEG_FALSE,;t t
-s, at CXX@,$CXX,;t t
-s, at CXXFLAGS@,$CXXFLAGS,;t t
-s, at ac_ct_CXX@,$ac_ct_CXX,;t t
s, at CXXDEPMODE@,$CXXDEPMODE,;t t
s, at am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
s, at am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
s, at BOOST_CPPFLAGS@,$BOOST_CPPFLAGS,;t t
s, at BOOST_LDFLAGS@,$BOOST_LDFLAGS,;t t
s, at ac_boost_path@,$ac_boost_path,;t t
+s, at CC@,$CC,;t t
+s, at CFLAGS@,$CFLAGS,;t t
+s, at ac_ct_CC@,$ac_ct_CC,;t t
+s, at CCDEPMODE@,$CCDEPMODE,;t t
+s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
+s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
s, at BOOST_THREAD_LIB@,$BOOST_THREAD_LIB,;t t
s, at BOOST_DATE_TIME_LIB@,$BOOST_DATE_TIME_LIB,;t t
s, at BOOST_REGEX_LIB@,$BOOST_REGEX_LIB,;t t
@@ -42743,10 +41776,18 @@
s, at ROSE_BUILD_ROSEHPCT_TRUE@,$ROSE_BUILD_ROSEHPCT_TRUE,;t t
s, at ROSE_BUILD_ROSEHPCT_FALSE@,$ROSE_BUILD_ROSEHPCT_FALSE,;t t
s, at QROSE_PREFIX@,$QROSE_PREFIX,;t t
-s, at USE_QROSE_TRUE@,$USE_QROSE_TRUE,;t t
-s, at USE_QROSE_FALSE@,$USE_QROSE_FALSE,;t t
-s, at QROSE_LDFLAGS@,$QROSE_LDFLAGS,;t t
-s, at QROSE_CXXFLAGS@,$QROSE_CXXFLAGS,;t t
+s, at ROSE_USE_QROSE_TRUE@,$ROSE_USE_QROSE_TRUE,;t t
+s, at ROSE_USE_QROSE_FALSE@,$ROSE_USE_QROSE_FALSE,;t t
+s, at QT_INCLUDES@,$QT_INCLUDES,;t t
+s, at QT_LDFLAGS@,$QT_LDFLAGS,;t t
+s, at USING_WINDOWS@,$USING_WINDOWS,;t t
+s, at QROSE_USE_MINGW32_TRUE@,$QROSE_USE_MINGW32_TRUE,;t t
+s, at QROSE_USE_MINGW32_FALSE@,$QROSE_USE_MINGW32_FALSE,;t t
+s, at QROSE_USE_WINDOWS_TRUE@,$QROSE_USE_WINDOWS_TRUE,;t t
+s, at QROSE_USE_WINDOWS_FALSE@,$QROSE_USE_WINDOWS_FALSE,;t t
+s, at MOC@,$MOC,;t t
+s, at ROSE_USE_QT_TRUE@,$ROSE_USE_QT_TRUE,;t t
+s, at ROSE_USE_QT_FALSE@,$ROSE_USE_QT_FALSE,;t t
s, at LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/configure.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -65,7 +65,7 @@
#echo "Exiting as a test!"
#exit 1
-AM_CONDITIONAL(ROSE_USE_QROSE,test "$with_qrose" = true)
+#AM_CONDITIONAL(ROSE_USE_QROSE,test "$with_qrose" = true)
# Set up for use of bison to build dot2gml tool in directory
# src/roseIndependentSupport/dot2gml. This is made optional
@@ -103,8 +103,9 @@
AC_SUBST(ROSE_HOME)
# echo "In ROSE/configure: ROSE_HOME = $ROSE_HOME"
+# This does not appear to exist any more
# Support for Gabriel's QRose GUI Library
-ROSE_SUPPORT_QROSE
+# ROSE_SUPPORT_QROSE
AC_LANG(C++)
AX_BOOST_BASE([1.35.0], [], [echo "Boost 1.35.0 or above is required for ROSE" 1>&2; exit 1])
@@ -777,19 +778,27 @@
# GMY (9/3/2008) QT4 & QROSE Optional Packages
AC_ARG_WITH(QRose,
[--with-QRose=PATH prefix of QRose installation],
- [QROSE_PREFIX=$with_QRose])
+ [QROSE_PREFIX=$with_QRose],
+ [with_QRose=no])
AC_SUBST(QROSE_PREFIX)
-AM_CONDITIONAL(USE_QROSE, test "$with_QRose" != no)
-QROSE_LDFLAGS="-L${QROSE_PREFIX}/lib -lqrose"
-QROSE_CXXFLAGS="-I${QROSE_PREFIX}/include"
-AC_SUBST(QROSE_LDFLAGS)
-AC_SUBST(QROSE_CXXFLAGS)
+AM_CONDITIONAL(ROSE_USE_QROSE,test "$with_QRose" != no)
+#AM_CONDITIONAL(USE_QROSE, test "$with_QRose" != no)
+#QROSE_LDFLAGS="-L${QROSE_PREFIX}/lib -lqrose"
+#QROSE_CXXFLAGS="-I${QROSE_PREFIX}/include"
+#AC_SUBST(QROSE_LDFLAGS)
+#AC_SUBST(QROSE_CXXFLAGS)
+
+echo "with_QRose = $with_QRose"
+
AC_PATH_QT
AC_PATH_QT_MOC
+echo "with_qt = $with_qt"
+AM_CONDITIONAL(ROSE_USE_QT,test "$with_qt" != no)
+
AC_CONFIG_SUBDIRS([src/3rdPartyLibraries/libltdl src/3rdPartyLibraries/libharu-2.1.0])
# RV 9/14/2005: Removed src/3rdPartyLibraries/PDFLibrary/Makefile
@@ -905,13 +914,6 @@
src/roseExtensions/roseHPCToolkit/docs/Makefile
src/roseIndependentSupport/Makefile
src/roseIndependentSupport/dot2gml/Makefile
-src/roseIndependentSupport/graphicalUserInterface/Makefile
-src/roseIndependentSupport/graphicalUserInterface/src/Makefile
-src/roseIndependentSupport/graphicalUserInterface/src/QRTree/Makefile
-src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox/Makefile
-src/roseIndependentSupport/graphicalUserInterface/src/QRGui/Makefile
-src/roseIndependentSupport/graphicalUserInterface/src/QRGui/icons22/Makefile
-src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox/Makefile
projects/Makefile
projects/compass/Makefile
projects/compass/src/Makefile
@@ -934,6 +936,7 @@
projects/compass/tools/sampleCompassSubset/Makefile
projects/compass/tools/compassVerifier/Makefile
projects/BinaryCloneDetection/Makefile
+projects/BinaryCloneDetection/gui/Makefile
projects/binCompass/Makefile
projects/binCompass/analyses/Makefile
projects/binCompass/graphanalyses/Makefile
@@ -1074,11 +1077,6 @@
exampleTranslators/documentedExamples/AstRewriteExamples/Makefile
exampleTranslators/documentedExamples/dataBaseExamples/Makefile
exampleTranslators/defaultTranslator/Makefile
-exampleTranslators/graphicalUserInterfaceExamples/Makefile
-exampleTranslators/graphicalUserInterfaceExamples/slicing/Makefile
-exampleTranslators/graphicalUserInterfaceExamples/attributes/Makefile
-exampleTranslators/graphicalUserInterfaceExamples/query/Makefile
-exampleTranslators/graphicalUserInterfaceExamples/layout/Makefile
docs/Makefile
docs/Rose/rose.html
docs/Rose/projects.html
@@ -1096,6 +1094,20 @@
scripts/Makefile
])
+# DQ (9/12/2008): Removed older version of QRose (now an external project)
+# src/roseIndependentSupport/graphicalUserInterface/Makefile
+# src/roseIndependentSupport/graphicalUserInterface/src/Makefile
+# src/roseIndependentSupport/graphicalUserInterface/src/QRTree/Makefile
+# src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox/Makefile
+# src/roseIndependentSupport/graphicalUserInterface/src/QRGui/Makefile
+# src/roseIndependentSupport/graphicalUserInterface/src/QRGui/icons22/Makefile
+# src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox/Makefile
+# exampleTranslators/graphicalUserInterfaceExamples/Makefile
+# exampleTranslators/graphicalUserInterfaceExamples/slicing/Makefile
+# exampleTranslators/graphicalUserInterfaceExamples/attributes/Makefile
+# exampleTranslators/graphicalUserInterfaceExamples/query/Makefile
+# exampleTranslators/graphicalUserInterfaceExamples/layout/Makefile
+
AC_CONFIG_COMMANDS([default],[[
echo "Ensuring Grammar in the compile tree (assuming source tree is not the same as the compile tree)."
pathToSourceDir=`cd $srcdir && pwd`
Modified: trunk/docs/Makefile.in
===================================================================
--- trunk/docs/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/docs/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -68,7 +68,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -85,6 +84,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -140,7 +140,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -191,8 +190,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -210,8 +207,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -222,8 +217,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -252,13 +245,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -303,6 +292,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -326,8 +317,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -374,8 +363,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/docs/Rose/Makefile.in
===================================================================
--- trunk/docs/Rose/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/docs/Rose/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -95,7 +95,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -112,6 +111,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -170,7 +170,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -221,8 +220,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -240,8 +237,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -252,8 +247,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -282,13 +275,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -333,6 +322,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -356,8 +347,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -404,8 +393,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -447,14 +434,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -466,32 +453,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -557,6 +545,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -602,10 +591,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/docs/Rose/Tutorial/Makefile.in
===================================================================
--- trunk/docs/Rose/Tutorial/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/docs/Rose/Tutorial/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -63,7 +63,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -80,6 +79,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -126,7 +126,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -177,8 +176,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -196,8 +193,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -208,8 +203,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -238,13 +231,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -289,6 +278,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -312,8 +303,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -360,8 +349,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/exampleTranslators/AstCopyReplTester/Makefile.in
===================================================================
--- trunk/exampleTranslators/AstCopyReplTester/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/exampleTranslators/AstCopyReplTester/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -132,7 +132,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -140,9 +141,10 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
astCopyReplTest_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -191,7 +193,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -242,8 +243,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -261,8 +260,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -273,8 +270,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -303,13 +298,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -354,6 +345,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -377,8 +370,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -425,8 +416,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -468,14 +457,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -487,32 +476,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -578,6 +568,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -623,10 +614,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/exampleTranslators/DOTGenerator/Makefile.in
===================================================================
--- trunk/exampleTranslators/DOTGenerator/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/exampleTranslators/DOTGenerator/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -133,7 +133,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -141,16 +142,17 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
dotGenerator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
am_dotGeneratorWholeASTGraph_OBJECTS = \
dotGeneratorWholeASTGraph.$(OBJEXT)
dotGeneratorWholeASTGraph_OBJECTS = \
$(am_dotGeneratorWholeASTGraph_OBJECTS)
dotGeneratorWholeASTGraph_LDADD = $(LDADD)
dotGeneratorWholeASTGraph_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -200,7 +202,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -251,8 +252,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -270,8 +269,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -282,8 +279,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -312,13 +307,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -363,6 +354,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -386,8 +379,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -434,8 +425,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -477,14 +466,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -496,32 +485,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -587,6 +577,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -632,10 +623,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/exampleTranslators/Makefile.am
===================================================================
--- trunk/exampleTranslators/Makefile.am 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/exampleTranslators/Makefile.am 2008-09-12 20:14:11 UTC (rev 32)
@@ -5,6 +5,9 @@
defaultTranslator \
DOTGenerator \
PDFGenerator \
- AstCopyReplTester \
- graphicalUserInterfaceExamples
+ AstCopyReplTester
+# DQ (9/11/2008): We can add these later but these are older QRose examples.
+# Current examples are in developersScratchSpace/Dan/QRose_tests.
+# graphicalUserInterfaceExamples
+
Modified: trunk/exampleTranslators/Makefile.in
===================================================================
--- trunk/exampleTranslators/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/exampleTranslators/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -161,7 +161,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -212,8 +211,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -231,8 +228,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -243,8 +238,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -273,13 +266,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -324,6 +313,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -347,8 +338,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -395,8 +384,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -438,14 +425,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -457,32 +444,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -548,6 +536,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -593,10 +582,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
@@ -611,8 +602,7 @@
defaultTranslator \
DOTGenerator \
PDFGenerator \
- AstCopyReplTester \
- graphicalUserInterfaceExamples
+ AstCopyReplTester
all: all-recursive
@@ -944,6 +934,10 @@
# DQ (10/22/2004): Removed when I could not get annotation work to compile properly
# with make distcheck rule
# -lannotationLanguageParser(appears after -lvaluePropagation)
+
+# DQ (9/11/2008): We can add these later but these are older QRose examples.
+# Current examples are in developersScratchSpace/Dan/QRose_tests.
+# graphicalUserInterfaceExamples
# 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.
.NOEXPORT:
Modified: trunk/exampleTranslators/PDFGenerator/Makefile.in
===================================================================
--- trunk/exampleTranslators/PDFGenerator/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/exampleTranslators/PDFGenerator/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -132,7 +132,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -140,9 +141,10 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
pdfGenerator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -191,7 +193,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -242,8 +243,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -261,8 +260,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -273,8 +270,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -303,13 +298,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -354,6 +345,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -377,8 +370,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -425,8 +416,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -468,14 +457,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -487,32 +476,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -578,6 +568,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -623,10 +614,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/exampleTranslators/defaultTranslator/Makefile.in
===================================================================
--- trunk/exampleTranslators/defaultTranslator/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/exampleTranslators/defaultTranslator/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -132,7 +132,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -140,9 +141,10 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
defaultTranslator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -191,7 +193,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -242,8 +243,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -261,8 +260,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -273,8 +270,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -303,13 +298,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -354,6 +345,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -377,8 +370,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -425,8 +416,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -468,14 +457,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -487,32 +476,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -578,6 +568,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -623,10 +614,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/exampleTranslators/documentedExamples/AstRewriteExamples/Makefile.in
===================================================================
--- trunk/exampleTranslators/documentedExamples/AstRewriteExamples/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/exampleTranslators/documentedExamples/AstRewriteExamples/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -132,7 +132,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -140,9 +141,10 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
astRewriteExample1_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -191,7 +193,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -242,8 +243,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -261,8 +260,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -273,8 +270,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -303,13 +298,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -354,6 +345,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -377,8 +370,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -425,8 +416,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -468,14 +457,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -487,32 +476,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -578,6 +568,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -623,10 +614,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/exampleTranslators/documentedExamples/Makefile.in
===================================================================
--- trunk/exampleTranslators/documentedExamples/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/exampleTranslators/documentedExamples/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -90,7 +90,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -107,6 +106,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -162,7 +162,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -213,8 +212,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -232,8 +229,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -244,8 +239,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -274,13 +267,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -325,6 +314,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -348,8 +339,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -396,8 +385,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -439,14 +426,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -458,32 +445,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -549,6 +537,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -594,10 +583,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/exampleTranslators/documentedExamples/dataBaseExamples/Makefile.in
===================================================================
--- trunk/exampleTranslators/documentedExamples/dataBaseExamples/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/exampleTranslators/documentedExamples/dataBaseExamples/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -90,7 +90,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -107,6 +106,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -153,7 +153,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -204,8 +203,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -223,8 +220,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -235,8 +230,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -265,13 +258,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -316,6 +305,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -339,8 +330,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -387,8 +376,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -430,14 +417,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -449,32 +436,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -540,6 +528,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -585,10 +574,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/exampleTranslators/documentedExamples/simpleTranslatorExamples/Makefile.in
===================================================================
--- trunk/exampleTranslators/documentedExamples/simpleTranslatorExamples/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/exampleTranslators/documentedExamples/simpleTranslatorExamples/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -133,7 +133,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -141,9 +142,10 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
identityTranslator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -192,7 +194,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -243,8 +244,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -262,8 +261,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -274,8 +271,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -304,13 +299,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -355,6 +346,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -378,8 +371,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -426,8 +417,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -469,14 +458,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -488,32 +477,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -579,6 +569,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -624,10 +615,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/BabelPreprocessor/Makefile.in
===================================================================
--- trunk/projects/BabelPreprocessor/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/BabelPreprocessor/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -93,7 +93,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -110,6 +109,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -137,7 +137,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -145,7 +146,8 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -202,7 +204,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -256,8 +257,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -275,8 +274,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -287,8 +284,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -317,13 +312,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -368,6 +359,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -391,8 +384,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -439,8 +430,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -482,14 +471,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -501,32 +490,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -592,6 +582,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -637,10 +628,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/BinaryCloneDetection/Makefile.am
===================================================================
--- trunk/projects/BinaryCloneDetection/Makefile.am 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/BinaryCloneDetection/Makefile.am 2008-09-12 20:14:11 UTC (rev 32)
@@ -2,6 +2,9 @@
# Use --with-libxml2 on configure command-line for ROSE to activate this
+SUBDIRS = gui
+
+
if ROSE_USE_SQLITE_DATABASE
INCLUDES = $(ROSE_INCLUDES) $(SQLITE_DATABASE_INCLUDE)
Modified: trunk/projects/BinaryCloneDetection/Makefile.in
===================================================================
--- trunk/projects/BinaryCloneDetection/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/BinaryCloneDetection/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -134,7 +134,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -142,10 +143,11 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
@ROSE_USE_SQLITE_DATABASE_TRUE at printOutClones_DEPENDENCIES = \
@ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1) \
- at ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_6)
+ at ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -158,8 +160,15 @@
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(printOutClones_SOURCES)
DIST_SOURCES = $(am__printOutClones_SOURCES_DIST)
+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@
@@ -194,7 +203,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -245,8 +253,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -264,8 +270,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -276,8 +280,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -306,13 +308,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -357,6 +355,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -380,8 +380,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -428,8 +426,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -471,14 +467,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -490,32 +486,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -581,6 +578,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -626,10 +624,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
@@ -641,10 +641,11 @@
ROSE_SEPARATE_LIBS = $(ROSE_LIBS)
# Use --with-libxml2 on configure command-line for ROSE to activate this
+SUBDIRS = gui
@ROSE_USE_SQLITE_DATABASE_TRUE at INCLUDES = $(ROSE_INCLUDES) $(SQLITE_DATABASE_INCLUDE)
@ROSE_USE_SQLITE_DATABASE_TRUE at LDADD = $(LIBS_WITH_RPATH) $(ROSE_LIBS)
@ROSE_USE_SQLITE_DATABASE_TRUE at printOutClones_SOURCES = printOutClones.C
-all: all-am
+all: all-recursive
.SUFFIXES:
.SUFFIXES: .C .lo .o .obj
@@ -734,6 +735,77 @@
-rm -f libtool
uninstall-info-am:
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+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)'; \
unique=`for i in $$list; do \
@@ -744,10 +816,23 @@
mkid -fID $$unique
tags: TAGS
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+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; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
@@ -760,7 +845,7 @@
$$tags $$unique; \
fi
ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
@@ -810,22 +895,38 @@
|| exit 1; \
fi; \
done
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
check-am: all-am
-check: check-am
+check: check-recursive
all-am: Makefile $(PROGRAMS)
-installdirs:
+installdirs: installdirs-recursive
+installdirs-am:
for dir in "$(DESTDIR)$(bindir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-installcheck: installcheck-am
+installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -841,23 +942,23 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
+clean: clean-recursive
clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \
mostlyclean-am
-distclean: distclean-am
+distclean: distclean-recursive
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-libtool distclean-tags
-dvi: dvi-am
+dvi: dvi-recursive
dvi-am:
-html: html-am
+html: html-recursive
-info: info-am
+info: info-recursive
info-am:
@@ -865,43 +966,47 @@
install-exec-am: install-binPROGRAMS
-install-info: install-info-am
+install-info: install-info-recursive
install-man:
installcheck-am:
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool
-pdf: pdf-am
+pdf: pdf-recursive
pdf-am:
-ps: ps-am
+ps: ps-recursive
ps-am:
uninstall-am: uninstall-binPROGRAMS uninstall-info-am
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
- clean-generic clean-libtool clean-local ctags distclean \
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+ clean clean-binPROGRAMS clean-generic clean-libtool \
+ clean-local clean-recursive ctags ctags-recursive distclean \
distclean-compile distclean-generic distclean-libtool \
- 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 maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-binPROGRAMS \
- uninstall-info-am
+ 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
# JJW (2/25/2008): set a flag (only used when running ROSE applications) to
Added: trunk/projects/BinaryCloneDetection/gui/Makefile.am
===================================================================
--- trunk/projects/BinaryCloneDetection/gui/Makefile.am (rev 0)
+++ trunk/projects/BinaryCloneDetection/gui/Makefile.am 2008-09-12 20:14:11 UTC (rev 32)
@@ -0,0 +1,29 @@
+include $(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
+
+if ROSE_USE_QROSE
+
+bin_PROGRAMS = binaryCloneGui
+
+binaryCloneGui_SOURCES = \
+ binaryCloneMainGui.C \
+ binaryCloneGui.C
+
+binaryCloneGui_LDADD = $(ROSE_LIBS) $(QT_LDFLAGS) $(QROSE_LDFLAGS) -lrt
+
+INCLUDES = $(ROSE_INCLUDES) $(BOOST_CPPFLAGS) -I.
+
+
+compass_parameters:
+ cd .. && $(MAKE) compass_parameters
+ cp -f ../compass_parameters .
+
+check-local:
+ @echo "************************************************************************************"
+ @echo "*** ROSE/projects/compass/tools/compass/gui: make check rule complete (terminated normally) ***"
+ @echo "************************************************************************************"
+
+CLEANFILES =
+
+EXTRA_DIST =
+
+endif
Added: trunk/projects/BinaryCloneDetection/gui/Makefile.in
===================================================================
--- trunk/projects/BinaryCloneDetection/gui/Makefile.in (rev 0)
+++ trunk/projects/BinaryCloneDetection/gui/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -0,0 +1,937 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+# These definitions are for the benefit of independent software contained
+# in ROSE. (Currently, this means SAGE and ROSETTA.)
+# It defines ROSE_INCLUDES and ROSE_LIBS so they can use the ROSE codes.
+
+# ROSE_INCLUDES contains the include flags for compiling with ROSE code.
+# (ROSE software should set the include paths in their respective Makefile.am
+# files, since they are expected to know the ROSE source tree structure.)
+# To use ROSE_INCLUDES, the independent software packages contained in ROSE
+# should define the variable ROSE_HOME to be the relative path to the root
+# of the ROSE directory tree.
+
+# This fixes some problem caused by automake or autoconf
+# (detailed documentation is in the ChangeLog)
+# MAKE=gmake
+
+# DQ (8/10/2007): Valentin suggested this be commented out.
+# DQ (4/23/2006): This is the default when build using automake version 1.6.3 but it
+# causes errors so we would like to specify --run automake instead
+# AUTOMAKE = ${SHELL} $(top_srcdir)/config/missing --run automake-1.6
+# AUTOMAKE = ${SHELL} $(top_srcdir)/config/missing --run automake
+
+# force ranlib to just call touch so that *.so (dynamic libraries) will not
+# be run with ranlib (which is a error). This allows us to use dynamic
+# libraries as the default within ROSE.
+# JJW 7/25/2008: Do we really need this?
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
+ at ROSE_USE_QROSE_TRUE@bin_PROGRAMS = binaryCloneGui$(EXEEXT)
+subdir = projects/BinaryCloneDetection/gui
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = \
+ $(top_srcdir)/src/3rdPartyLibraries/libltdl/acinclude.m4 \
+ $(top_srcdir)/acmacros/compiler-ar.m4 \
+ $(top_srcdir)/acmacros/compiler-id.m4 \
+ $(top_srcdir)/acmacros/configure-log.m4 \
+ $(top_srcdir)/config/EDG.m4 $(top_srcdir)/config/ROSE.m4 \
+ $(top_srcdir)/config/ac_pkg_swig.m4 \
+ $(top_srcdir)/config/ax_boost_base.m4 \
+ $(top_srcdir)/config/ax_boost_date_time.m4 \
+ $(top_srcdir)/config/ax_boost_filesystem.m4 \
+ $(top_srcdir)/config/ax_boost_program_options.m4 \
+ $(top_srcdir)/config/ax_boost_regex.m4 \
+ $(top_srcdir)/config/ax_boost_serialization.m4 \
+ $(top_srcdir)/config/ax_boost_system.m4 \
+ $(top_srcdir)/config/ax_boost_thread.m4 \
+ $(top_srcdir)/config/ax_boost_wave.m4 \
+ $(top_srcdir)/config/ax_lib_mysql.m4 \
+ $(top_srcdir)/config/ax_lib_sqlite3.m4 \
+ $(top_srcdir)/config/ax_with_prog.m4 \
+ $(top_srcdir)/config/choose-backend-compiler.m4 \
+ $(top_srcdir)/config/compiler-defs.m4 \
+ $(top_srcdir)/config/enable-rosehpct.m4 \
+ $(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
+ $(top_srcdir)/config/mdl_have_opengl.m4 \
+ $(top_srcdir)/config/qrose_indigo_1.m4 \
+ $(top_srcdir)/config/qrose_indigo_1_windows.m4 \
+ $(top_srcdir)/config/support-bddbddb.m4 \
+ $(top_srcdir)/config/support-binary-analysis.m4 \
+ $(top_srcdir)/config/support-doxygen.m4 \
+ $(top_srcdir)/config/support-edg-debugging.m4 \
+ $(top_srcdir)/config/support-gcc-omp.m4 \
+ $(top_srcdir)/config/support-insure.m4 \
+ $(top_srcdir)/config/support-java.m4 \
+ $(top_srcdir)/config/support-maple.m4 \
+ $(top_srcdir)/config/support-mysql.m4 \
+ $(top_srcdir)/config/support-omp.m4 \
+ $(top_srcdir)/config/support-php.m4 \
+ $(top_srcdir)/config/support-purify.m4 \
+ $(top_srcdir)/config/support-python.m4 \
+ $(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
+ $(top_srcdir)/config/support-yices.m4 \
+ $(top_srcdir)/config/swig_enable_cxx.m4 \
+ $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/rose_config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS)
+am__binaryCloneGui_SOURCES_DIST = binaryCloneMainGui.C \
+ binaryCloneGui.C
+ at ROSE_USE_QROSE_TRUE@am_binaryCloneGui_OBJECTS = \
+ at ROSE_USE_QROSE_TRUE@ binaryCloneMainGui.$(OBJEXT) \
+ at ROSE_USE_QROSE_TRUE@ binaryCloneGui.$(OBJEXT)
+binaryCloneGui_OBJECTS = $(am_binaryCloneGui_OBJECTS)
+am__DEPENDENCIES_1 =
+ at ROSE_USE_MYSQL_DATABASE_TRUE@am__DEPENDENCIES_2 = \
+ at ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
+ at ROSE_USE_SQLITE_DATABASE_TRUE@am__DEPENDENCIES_3 = \
+ at ROSE_USE_SQLITE_DATABASE_TRUE@ $(am__DEPENDENCIES_1)
+ at ROSE_USE_YICES_TRUE@am__DEPENDENCIES_4 = \
+ at ROSE_USE_YICES_TRUE@ $(yices_path)/lib/libyices.a
+ at ROSE_USE_PHP_TRUE@am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
+ at ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
+ at ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
+ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ at ROSE_USE_QROSE_TRUE@binaryCloneGui_DEPENDENCIES = \
+ at ROSE_USE_QROSE_TRUE@ $(am__DEPENDENCIES_7) \
+ at ROSE_USE_QROSE_TRUE@ $(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+CXXCOMPILE = @echo " COMPILE $@"; $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = @echo " COMPILE $@"; $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(binaryCloneGui_SOURCES)
+DIST_SOURCES = $(am__binaryCloneGui_SOURCES_DIST)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AUX_LINKER = @AUX_LINKER@
+AWK = @AWK@
+AXXPXX_SPECIFIC_TESTS_FALSE = @AXXPXX_SPECIFIC_TESTS_FALSE@
+AXXPXX_SPECIFIC_TESTS_TRUE = @AXXPXX_SPECIFIC_TESTS_TRUE@
+Axx_INCLUDES = @Axx_INCLUDES@
+Axx_LIBS = @Axx_LIBS@
+BINARY_EDG_TARBALL_ENABLED_FALSE = @BINARY_EDG_TARBALL_ENABLED_FALSE@
+BINARY_EDG_TARBALL_ENABLED_TRUE = @BINARY_EDG_TARBALL_ENABLED_TRUE@
+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
+BOOST_DATE_TIME_LIB = @BOOST_DATE_TIME_LIB@
+BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@
+BOOST_LDFLAGS = @BOOST_LDFLAGS@
+BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
+BOOST_REGEX_LIB = @BOOST_REGEX_LIB@
+BOOST_SERIALIZATION_LIB = @BOOST_SERIALIZATION_LIB@
+BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
+BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
+BOOST_WAVE_LIB = @BOOST_WAVE_LIB@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CCLD = @CCLD@
+CFLAGS = @CFLAGS@
+CLASSPATH = @CLASSPATH@
+CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
+CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CXX_DEBUG = @CXX_DEBUG@
+CXX_OPTIMIZE = @CXX_OPTIMIZE@
+CXX_SHARED_LIB_UPDATE = @CXX_SHARED_LIB_UPDATE@
+CXX_STATIC_LIB_UPDATE = @CXX_STATIC_LIB_UPDATE@
+CXX_TEMPLATE_OBJECTS = @CXX_TEMPLATE_OBJECTS@
+CXX_TEMPLATE_REPOSITORY_PATH = @CXX_TEMPLATE_REPOSITORY_PATH@
+CXX_WARNINGS = @CXX_WARNINGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOT_TO_GML_TRANSLATOR_FALSE = @DOT_TO_GML_TRANSLATOR_FALSE@
+DOT_TO_GML_TRANSLATOR_TRUE = @DOT_TO_GML_TRANSLATOR_TRUE@
+DOXYGEN_ADDED_DIRECTORY_1 = @DOXYGEN_ADDED_DIRECTORY_1@
+DOXYGEN_ADDED_DIRECTORY_2 = @DOXYGEN_ADDED_DIRECTORY_2@
+DOXYGEN_ENABLED_SECTIONS = @DOXYGEN_ENABLED_SECTIONS@
+DOXYGEN_EXTRACT_ALL = @DOXYGEN_EXTRACT_ALL@
+DOXYGEN_EXTRACT_PRIVATE = @DOXYGEN_EXTRACT_PRIVATE@
+DOXYGEN_EXTRACT_STATIC = @DOXYGEN_EXTRACT_STATIC@
+DOXYGEN_HIDE_FRIEND_COMPOUNDS = @DOXYGEN_HIDE_FRIEND_COMPOUNDS@
+DOXYGEN_HIDE_UNDOC_CLASSES = @DOXYGEN_HIDE_UNDOC_CLASSES@
+DOXYGEN_HIDE_UNDOC_MEMBERS = @DOXYGEN_HIDE_UNDOC_MEMBERS@
+DOXYGEN_INTERNAL_DOCS = @DOXYGEN_INTERNAL_DOCS@
+DOXYGEN_USE_TAG_FILE = @DOXYGEN_USE_TAG_FILE@
+DQ_DEVELOPER_TESTS_FALSE = @DQ_DEVELOPER_TESTS_FALSE@
+DQ_DEVELOPER_TESTS_TRUE = @DQ_DEVELOPER_TESTS_TRUE@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENABLE_JAVAPORT_FALSE = @ENABLE_JAVAPORT_FALSE@
+ENABLE_JAVAPORT_TRUE = @ENABLE_JAVAPORT_TRUE@
+EXE = @EXE@
+EXEEXT = @EXEEXT@
+EXPECTED_BINARY_EDG_DIRNAME = @EXPECTED_BINARY_EDG_DIRNAME@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FLTK_include_path = @FLTK_include_path@
+FLTK_libs_path = @FLTK_libs_path@
+GEN_BE = @GEN_BE@
+GFORTRAN_PATH = @GFORTRAN_PATH@
+GLUT_include_path = @GLUT_include_path@
+GLUT_libs_path = @GLUT_libs_path@
+GL_CFLAGS = @GL_CFLAGS@
+GL_LIBS = @GL_LIBS@
+GraphViz_include_path = @GraphViz_include_path@
+GraphViz_libs_path = @GraphViz_libs_path@
+INCLUDE_COMPASS_MAKEFILE_INC = @INCLUDE_COMPASS_MAKEFILE_INC@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_LTDL_FALSE = @INSTALL_LTDL_FALSE@
+INSTALL_LTDL_TRUE = @INSTALL_LTDL_TRUE@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSURE_OPTIONS = @INSURE_OPTIONS@
+JAR = @JAR@
+JAVA = @JAVA@
+JAVAC = @JAVAC@
+JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
+JAVA_JVM_LINK = @JAVA_JVM_LINK@
+JAVA_PATH = @JAVA_PATH@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBADD_DL = @LIBADD_DL@
+LIBLTDL = @LIBLTDL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
+LIBTOOL = @LIBTOOL@ --quiet
+LN_S = @LN_S@
+LTDLINCL = @LTDLINCL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MD5 = @MD5@
+MOC = @MOC@
+MPICXX = @MPICXX@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
+MYSQL_CONFIG = @MYSQL_CONFIG@
+MYSQL_LDFLAGS = @MYSQL_LDFLAGS@
+MYSQL_VERSION = @MYSQL_VERSION@
+MySQL_database_name = @MySQL_database_name@
+MySQL_login_string = @MySQL_login_string@
+MySQL_password = @MySQL_password@
+MySQL_path = @MySQL_path@
+MySQL_server = @MySQL_server@
+MySQL_username = @MySQL_username@
+OBJ = @OBJ@
+OBJEXT = @OBJEXT@
+OPEN_FORTRAN_PARSER_PATH = @OPEN_FORTRAN_PARSER_PATH@
+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@
+PERL = @PERL@
+PURIFY_OPTIONS = @PURIFY_OPTIONS@
+Pxx_INCLUDES = @Pxx_INCLUDES@
+Pxx_LIBS = @Pxx_LIBS@
+QROSE_PREFIX = @QROSE_PREFIX@
+QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
+QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
+QROSE_USE_WINDOWS_FALSE = @QROSE_USE_WINDOWS_FALSE@
+QROSE_USE_WINDOWS_TRUE = @QROSE_USE_WINDOWS_TRUE@
+QT_INCLUDES = @QT_INCLUDES@
+QT_LDFLAGS = @QT_LDFLAGS@
+RANLIB = @RANLIB@
+ROSEHPCT_DEP_INCLUDES = @ROSEHPCT_DEP_INCLUDES@
+ROSEHPCT_DEP_LIBS = @ROSEHPCT_DEP_LIBS@
+ROSE_BUILD_ROSEHPCT_FALSE = @ROSE_BUILD_ROSEHPCT_FALSE@
+ROSE_BUILD_ROSEHPCT_TRUE = @ROSE_BUILD_ROSEHPCT_TRUE@
+ROSE_HOME = @ROSE_HOME@
+ROSE_MPI_FALSE = @ROSE_MPI_FALSE@
+ROSE_MPI_TRUE = @ROSE_MPI_TRUE@
+ROSE_OBJDUMP_PATH = @ROSE_OBJDUMP_PATH@
+ROSE_USE_BDDBDDB_FALSE = @ROSE_USE_BDDBDDB_FALSE@
+ROSE_USE_BDDBDDB_TRUE = @ROSE_USE_BDDBDDB_TRUE@
+ROSE_USE_BINARYCONTEXTLOOKUP_FALSE = @ROSE_USE_BINARYCONTEXTLOOKUP_FALSE@
+ROSE_USE_BINARYCONTEXTLOOKUP_TRUE = @ROSE_USE_BINARYCONTEXTLOOKUP_TRUE@
+ROSE_USE_BINARY_SQL_FALSE = @ROSE_USE_BINARY_SQL_FALSE@
+ROSE_USE_BINARY_SQL_TRUE = @ROSE_USE_BINARY_SQL_TRUE@
+ROSE_USE_BOOST_WAVE_FALSE = @ROSE_USE_BOOST_WAVE_FALSE@
+ROSE_USE_BOOST_WAVE_TRUE = @ROSE_USE_BOOST_WAVE_TRUE@
+ROSE_USE_GCC_OMP_FALSE = @ROSE_USE_GCC_OMP_FALSE@
+ROSE_USE_GCC_OMP_TRUE = @ROSE_USE_GCC_OMP_TRUE@
+ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE = @ROSE_USE_LONG_MAKE_CHECK_RULE_FALSE@
+ROSE_USE_LONG_MAKE_CHECK_RULE_TRUE = @ROSE_USE_LONG_MAKE_CHECK_RULE_TRUE@
+ROSE_USE_MAPLE_FALSE = @ROSE_USE_MAPLE_FALSE@
+ROSE_USE_MAPLE_TRUE = @ROSE_USE_MAPLE_TRUE@
+ROSE_USE_MYSQL_DATABASE_FALSE = @ROSE_USE_MYSQL_DATABASE_FALSE@
+ROSE_USE_MYSQL_DATABASE_TRUE = @ROSE_USE_MYSQL_DATABASE_TRUE@
+ROSE_USE_OBJDUMP_FALSE = @ROSE_USE_OBJDUMP_FALSE@
+ROSE_USE_OBJDUMP_TRUE = @ROSE_USE_OBJDUMP_TRUE@
+ROSE_USE_OPENGL_FALSE = @ROSE_USE_OPENGL_FALSE@
+ROSE_USE_OPENGL_TRUE = @ROSE_USE_OPENGL_TRUE@
+ROSE_USE_OPENMP_FALSE = @ROSE_USE_OPENMP_FALSE@
+ROSE_USE_OPENMP_TRUE = @ROSE_USE_OPENMP_TRUE@
+ROSE_USE_OPEN_FORTRAN_PARSER_FALSE = @ROSE_USE_OPEN_FORTRAN_PARSER_FALSE@
+ROSE_USE_OPEN_FORTRAN_PARSER_TRUE = @ROSE_USE_OPEN_FORTRAN_PARSER_TRUE@
+ROSE_USE_PHP_FALSE = @ROSE_USE_PHP_FALSE@
+ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
+ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
+ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
+ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
+ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
+ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
+ROSE_USE_VISUALIZATION_TRUE = @ROSE_USE_VISUALIZATION_TRUE@
+ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_FALSE = @ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_FALSE@
+ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE = @ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE@
+ROSE_USE_XML_FALSE = @ROSE_USE_XML_FALSE@
+ROSE_USE_XML_TRUE = @ROSE_USE_XML_TRUE@
+ROSE_USE_YICES_FALSE = @ROSE_USE_YICES_FALSE@
+ROSE_USE_YICES_TRUE = @ROSE_USE_YICES_TRUE@
+RT_LIBS = @RT_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
+SQLITE3_LDFLAGS = @SQLITE3_LDFLAGS@
+SQLITE3_VERSION = @SQLITE3_VERSION@
+STRIP = @STRIP@
+SWIG = @SWIG@
+SWIG_LIB = @SWIG_LIB@
+USE_BINARY_ANALYSIS_TESTS_FALSE = @USE_BINARY_ANALYSIS_TESTS_FALSE@
+USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
+USE_GCJ_FALSE = @USE_GCJ_FALSE@
+USE_GCJ_TRUE = @USE_GCJ_TRUE@
+USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
+USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
+USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
+USE_VALGRIND_TRUE = @USE_VALGRIND_TRUE@
+USING_WINDOWS = @USING_WINDOWS@
+VALGRIND_BINARY = @VALGRIND_BINARY@
+VERSION = @VERSION@
+XML2_CONFIG = @XML2_CONFIG@
+XML_CPPFLAGS = @XML_CPPFLAGS@
+XML_LIBS = @XML_LIBS@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+absolute_path_srcdir = @absolute_path_srcdir@
+ac_boost_path = @ac_boost_path@
+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_MPICXX = @ac_ct_MPICXX@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_ROSE_OBJDUMP_PATH = @ac_ct_ROSE_OBJDUMP_PATH@
+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@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bddbddb_path = @bddbddb_path@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_triplet_without_redhat = @build_triplet_without_redhat@
+build_vendor = @build_vendor@
+configure_date = @configure_date@
+datadir = @datadir@
+edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
+exec_prefix = @exec_prefix@
+gcc_omp_path = @gcc_omp_path@
+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@
+insure_BIN = @insure_BIN@
+insure_INCLUDES = @insure_INCLUDES@
+insure_LIBS = @insure_LIBS@
+insure_PREFIX = @insure_PREFIX@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+maple_path = @maple_path@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+omp_runtime_support_path = @omp_runtime_support_path@
+optional_DataBase_subdirs = @optional_DataBase_subdirs@
+optional_Visualization_subdirs = @optional_Visualization_subdirs@
+php_path = @php_path@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+purify_BIN = @purify_BIN@
+purify_INCLUDES = @purify_INCLUDES@
+purify_LIBS = @purify_LIBS@
+purify_PREFIX = @purify_PREFIX@
+python_path = @python_path@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+subdirs = @subdirs@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_pwd = @top_pwd@
+wine_path = @wine_path@
+yices_path = @yices_path@
+ at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
+ at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
+ at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+ at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
+ at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
+ at ROSE_USE_MYSQL_DATABASE_TRUE@BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
+ at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
+ at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
+ at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_NAME = rosedatabase
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+ at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
+ at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
+ at ROSE_USE_MYSQL_DATABASE_TRUE@MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
+ at ROSE_USE_MYSQL_DATABASE_TRUE@MYSQL_DATABASE_INCLUDE = $(MYSQL_CFLAGS)
+
+# SQLite is a simpler database to use than MySQL
+ at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_INCLUDE = $(SQLITE3_CFLAGS)
+ at ROSE_USE_SQLITE_DATABASE_TRUE@SQLITE_DATABASE_INCLUDE = $(SQLITE3_CFLAGS) -I$(top_srcdir)/src/roseExtensions/sqlite3x
+ at ROSE_USE_SQLITE_DATABASE_TRUE@SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
+ at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
+ at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+ at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
+
+# This is properly handled by automake even when specified in an include file
+EDG_LIBS = @EDG_LIBS@
+
+# Conditional support for Gabriel's QRose GUI Library
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
+
+# ROSE-HPCToolkit module
+ at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
+ at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIBS = -lrosehpct
+ at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+
+# ROSE-YICES Package (destributed by SRI as a static library)
+ at ROSE_USE_YICES_TRUE@ROSE_YICES_INCLUDES = -I$(yices_path)/include
+ at ROSE_USE_YICES_TRUE@ROSE_YICES_LIBS = -lyices
+ at ROSE_USE_YICES_TRUE@ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
+
+# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
+ at ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE@ROSE_WINE_INCLUDES = -I$(wine_path)/include
+ at ROSE_USE_PHP_TRUE@ROSE_PHP_INCLUDES = -I$(php_path)/include/phc -I$(php_path)/include/php
+ at ROSE_USE_PHP_TRUE@ROSE_PHP_LIBS = -lphp5 -lphc -lltdl
+ at ROSE_USE_PHP_TRUE@ROSE_PHP_LIBS_WITH_PATH = $(php_path)/lib/libphc.so $(php_path)/lib/libphp5.so $(LIBLTDL)
+ROSE_INCLUDES = \
+ -I$(top_srcdir)/src \
+ -I$(top_builddir)/src/frontend/SageIII \
+ -I$(top_srcdir)/src/frontend/SageIII \
+ -I$(top_srcdir)/src/frontend/SageIII/astFixup \
+ -I$(top_srcdir)/src/frontend/SageIII/astPostProcessing \
+ -I$(top_srcdir)/src/frontend/SageIII/astMerge \
+ -I$(top_srcdir)/src/frontend/SageIII/astVisualization \
+ -I$(top_srcdir)/src/frontend/SageIII/astFileIO \
+ -I$(top_srcdir)/src/frontend/SageIII/sageInterface \
+ -I$(top_srcdir)/src/frontend/SageIII/virtualCFG \
+ -I$(top_srcdir)/src/frontend/SageIII/astTokenStream \
+ -I$(top_srcdir)/src/frontend/SageIII/astHiddenTypeAndDeclarationLists \
+ -I$(top_builddir)/src/frontend/SageIII/astFileIO \
+ -I$(top_srcdir)/src/frontend/OpenFortranParser_SAGE_Connection \
+ -I$(top_srcdir)/src/frontend/PHPFrontend \
+ -I$(top_srcdir)/src/frontend/BinaryDisassembly \
+ -I$(top_srcdir)/src/frontend/BinaryDisassembly/graph \
+ -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses \
+ -I$(top_srcdir)/src/frontend/BinaryDisassembly/analyses/dataflowanalyses \
+ -I$(top_srcdir)/src/frontend/Disassemblers \
+ -I$(top_srcdir)/src/frontend/ExecFormats \
+ -I$(top_srcdir)/src/backend/unparser \
+ -I$(top_srcdir)/src/backend/unparser/formatSupport \
+ -I$(top_srcdir)/src/backend/unparser/languageIndependenceSupport \
+ -I$(top_srcdir)/src/backend/unparser/CxxCodeGeneration \
+ -I$(top_srcdir)/src/backend/unparser/FortranCodeGeneration \
+ -I$(top_srcdir)/src/backend/unparser/PHPCodeGeneration \
+ -I$(top_srcdir)/src/backend/asmUnparser \
+ -I$(top_srcdir)/src/util \
+ -I$(top_srcdir)/src/util/support \
+ -I$(top_srcdir)/src/util/graphs \
+ -I$(top_srcdir)/src/util/stringSupport \
+ -I$(top_srcdir)/src/util/commandlineProcessing \
+ -I$(top_srcdir)/src/midend/astUtil/astSupport \
+ -I$(top_srcdir)/src/midend/astUtil/astInterface \
+ -I$(top_srcdir)/src/midend/astUtil/symbolicVal \
+ -I$(top_srcdir)/src/midend/astUtil/annotation \
+ -I$(top_srcdir)/src/midend/programAnalysis \
+ -I$(top_srcdir)/src/midend/programAnalysis/CallGraphAnalysis \
+ -I$(top_srcdir)/src/midend/programAnalysis/OAWrap \
+ -I$(top_srcdir)/src/midend/programAnalysis/CFG \
+ -I$(top_srcdir)/src/midend/programAnalysis/defUseAnalysis \
+ -I$(top_srcdir)/src/midend/programAnalysis/dominanceAnalysis \
+ -I$(top_srcdir)/src/midend/programAnalysis/staticInterproceduralSlicing \
+ -I$(top_srcdir)/src/midend/programAnalysis/distributedMemoryAnalysis \
+ -I$(top_srcdir)/src/midend/astInlining \
+ -I$(top_srcdir)/src/midend/astOutlining \
+ -I$(top_srcdir)/src/midend/astQuery \
+ -I$(top_srcdir)/src/midend/astRewriteMechanism \
+ -I$(top_srcdir)/src/midend/astProcessing \
+ -I$(top_srcdir)/src/midend/astDiagnostics \
+ -I$(top_srcdir)/src/midend/programAnalysis/dataflowAnalysis \
+ -I$(top_srcdir)/src/midend/programAnalysis/pointerAnal \
+ -I$(top_srcdir)/src/midend/programAnalysis/valuePropagation \
+ -I$(top_srcdir)/src/midend/loopProcessing/driver \
+ $(ROSE_SIDEEFFECTS_INCLUDE) \
+ $(ROSE_DATABASE_INCLUDE) \
+ $(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
+ $(MYSQL_DATABASE_INCLUDE) \
+ $(ROSE_SQLITE_DATABASE_INCLUDE) \
+ $(SQLITE_DATABASE_INCLUDE) \
+ -I$(top_srcdir)/src/midend/programTransformation/partialRedundancyElimination \
+ -I$(top_srcdir)/src/midend/programTransformation/finiteDifferencing \
+ -I$(top_srcdir)/src/midend/programTransformation/functionCallNormalization \
+ -I$(top_srcdir)/src/midend/programTransformation/constantFolding \
+ -I$(top_srcdir)/src/midend/programTransformation/implicitCodeGeneration \
+ -I$(top_srcdir)/src/midend/programTransformation/runtimeTransformation \
+ -I$(top_srcdir)/src/roseSupport \
+ -I$(top_srcdir)/src/3rdPartyLibraries/MSTL \
+\
+ -I$(top_srcdir)/src/3rdPartyLibraries/libltdl \
+ -I$(top_srcdir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_builddir)/src/3rdPartyLibraries/libharu-2.1.0/include \
+ -I$(top_srcdir)/projects/dataBase \
+ -I$(top_srcdir)/src/util/graphs \
+ -I$(top_srcdir)/src/midend/astUtil/astInterface \
+ $(ROSE_PHP_INCLUDES) \
+ $(VALGRIND_CFLAGS) \
+ $(BOOST_CPPFLAGS) $(SQLITE3_CFLAGS) -DBOOST_REGEX_MATCH_EXTRA
+
+
+# DQ: Not used currently
+# $(ROSE_YICES_INCLUDES)
+# $(ROSE_WINE_INCLUDES)
+
+# DQ (5/3/2007): Removed from ROSE
+# -I$(top_srcdir)/src/midend/programAnalysis/dominatorTreesAndDominanceFrontiers
+# -I$(top_srcdir)/src/midend/programAnalysis/staticProgramSlicing
+
+# DQ (10/22/2004): Removed when I could not get annotation work to compile properly with make distcheck rule
+# -I$(top_srcdir)/src/midend/programAnalysis/annotationLanguageParser
+
+# New way using two libraries
+# ROSE_LIBS_WITH_PATH = $(top_builddir)/src/librose.a $(top_builddir)/src/libedg.a
+# ROSE_LIBS_WITH_PATH = $(top_builddir)/src/librose.so $(top_builddir)/src/libedg.so
+# ROSE_LIBS_WITH_PATH = $(libdir)/librose.so $(libdir)/libedg.so
+# ROSE_LIBS_WITH_PATH = $(top_builddir)/src/librose.la
+# ROSE_LIBS_WITH_PATH = $(top_builddir)/src/librose.la $(JAVA_JVM_LIB)
+# JJW 7/25/2008: This should probably just be the same as ROSE_LIBS
+ROSE_LIBS_WITH_PATH = $(ROSE_LIBS)
+
+# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
+ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
+
+
+# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
+# development. The use of the seperate libraries make the linking faster where the
+# main librose library is not built. Libtool may have changed this so that we could
+# just link to librose now just as easily, but one has to rebuild librose each time
+# instead of just the individual shared library.
+# JJW 7/25/2008: This should probably just be the same as ROSE_LIBS
+ROSE_SEPARATE_LIBS = $(ROSE_LIBS)
+ at ROSE_USE_QROSE_TRUE@binaryCloneGui_SOURCES = \
+ at ROSE_USE_QROSE_TRUE@ binaryCloneMainGui.C \
+ at ROSE_USE_QROSE_TRUE@ binaryCloneGui.C
+
+ at ROSE_USE_QROSE_TRUE@binaryCloneGui_LDADD = $(ROSE_LIBS) $(QT_LDFLAGS) $(QROSE_LDFLAGS) -lrt
+ at ROSE_USE_QROSE_TRUE@INCLUDES = $(ROSE_INCLUDES) $(BOOST_CPPFLAGS) -I.
+ at ROSE_USE_QROSE_TRUE@CLEANFILES =
+ at ROSE_USE_QROSE_TRUE@EXTRA_DIST =
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .C .lo .o .obj
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs $(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 --ignore-deps projects/BinaryCloneDetection/gui/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --foreign --ignore-deps projects/BinaryCloneDetection/gui/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
+install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ 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" || exit 1; \
+ else :; fi; \
+ done
+
+uninstall-binPROGRAMS:
+ @$(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"; \
+ done
+
+clean-binPROGRAMS:
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f $$p $$f"; \
+ rm -f $$p $$f ; \
+ done
+binaryCloneGui$(EXEEXT): $(binaryCloneGui_OBJECTS) $(binaryCloneGui_DEPENDENCIES)
+ @rm -f binaryCloneGui$(EXEEXT)
+ $(CXXLINK) $(binaryCloneGui_LDFLAGS) $(binaryCloneGui_OBJECTS) $(binaryCloneGui_LDADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+.C.o:
+ $(CXXCOMPILE) -c -o $@ $<
+
+.C.obj:
+ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.C.lo:
+ $(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 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; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(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; }'`; \
+ 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) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ $(mkdir_p) $(distdir)/../../../config
+ @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"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+ if test -d $$d/$$file; then \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+ at ROSE_USE_QROSE_FALSE@check-local:
+check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) check-local
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+ for dir in "$(DESTDIR)$(bindir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
+ clean-binPROGRAMS clean-generic clean-libtool ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ 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 maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-binPROGRAMS \
+ uninstall-info-am
+
+
+# JJW (2/25/2008): set a flag (only used when running ROSE applications) to
+# have them run using the build tree rather than the install tree -- this is
+# important for "make check" in an uninstalled copy of ROSE.
+ at USE_ROSE_IN_BUILD_TREE_VAR_TRUE@export ROSE_IN_BUILD_TREE=$(top_builddir)
+
+# This is control over the use of MySQL (which is complicated to use and install)
+# This support for MySQL will be removed in the future.
+ at ROSE_USE_MYSQL_DATABASE_TRUE@ # The use of the side effect analysis is dependent upon the data base support
+ at ROSE_USE_MYSQL_DATABASE_TRUE@ # which is compiled optionally (see configure --help, for details)
+
+ at ROSE_USE_MYSQL_DATABASE_TRUE@ # Location of boost should be set in configuration (not done yet)
+
+ at ROSE_USE_MYSQL_DATABASE_TRUE@ # MySQL support is setup optionally at compile time (see configure --help, for details)
+# $(LIB_QT) $(JAVA_JVM_LIB)
+
+# QY (11/2/04): removed -lastoutlining from ROSE_SEPARATE_LIBS
+
+# DQ (10/22/2004): Removed when I could not get annotation work to compile properly
+# with make distcheck rule
+# -lannotationLanguageParser(appears after -lvaluePropagation)
+
+ at ROSE_USE_QROSE_TRUE@compass_parameters:
+ at ROSE_USE_QROSE_TRUE@ cd .. && $(MAKE) compass_parameters
+ at ROSE_USE_QROSE_TRUE@ cp -f ../compass_parameters .
+
+ at ROSE_USE_QROSE_TRUE@check-local:
+ at ROSE_USE_QROSE_TRUE@ @echo "************************************************************************************"
+ at ROSE_USE_QROSE_TRUE@ @echo "*** ROSE/projects/compass/tools/compass/gui: make check rule complete (terminated normally) ***"
+ at ROSE_USE_QROSE_TRUE@ @echo "************************************************************************************"
+# 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.
+.NOEXPORT:
Added: trunk/projects/BinaryCloneDetection/gui/binaryCloneGui.C
===================================================================
--- trunk/projects/BinaryCloneDetection/gui/binaryCloneGui.C (rev 0)
+++ trunk/projects/BinaryCloneDetection/gui/binaryCloneGui.C 2008-09-12 20:14:11 UTC (rev 32)
@@ -0,0 +1,69 @@
+#include <boost/algorithm/string.hpp>
+#include "binaryCloneGui.h"
+
+#include <sstream>
+#include <QFileDialog>
+
+#include <unistd.h>
+
+#include "icons.h"
+
+#include "disks.xpm"
+
+#define EMACS
+
+using namespace qrs;
+
+void toolbarClick(int action)
+{
+
+}
+
+
+static void tableCellActivated(int col, int row, int oldCol, int oldRow)
+{
+} //tableCellActivated(int col, int row, int oldCol, int oldRow)
+
+
+BinaryCloneGui::BinaryCloneGui( ) :
+ window(0)
+{
+ window = new QRWindow( "mainWindow", QROSE::TopDown );
+
+ {
+ //--------------------------------------------------------------------------
+
+ QRToolBar *toolbar = (*window)["toolbar"] << new QRToolBar(QROSE::LeftRight, true, true, true);
+
+ // icons are defined in <icons.h>
+ toolbar->addButton("run"); toolbar->setPicture(0, iconRun);
+ toolbar->addButton("reset"); toolbar->setPicture(1, iconReset);
+ toolbar->addSeparator();
+ toolbar->addButton("quit"); toolbar->setPicture(2, iconQuit);
+
+ QROSE::link(toolbar, SIGNAL(clicked(int)), &toolbarClick, this);
+
+ } //window
+
+
+
+ tableWidget = *window << new QRTable( 3, "Checker", "Timing", "Violations" );
+ QROSE::link(tableWidget, SIGNAL(activated(int, int, int, int)), &tableCellActivated, this);
+
+ codeWidget = *window << new QTextEdit;//new QREdit(QREdit::Box);
+ codeWidget->setReadOnly(true);
+ codeWidget->setHtml(QString("foobar\nBar\nFoobar"));
+
+ window->setGeometry(0,0,1280,800);
+ window->setTitle("BinaryCloneMainGui (QROSE)");
+
+} //BinaryCloneGui::BinaryCloneGui()
+
+BinaryCloneGui::~BinaryCloneGui()
+{
+ if( window ) delete window;
+
+} //BinaryCloneGui::~BinaryCloneGui()
+
+
+
Added: trunk/projects/BinaryCloneDetection/gui/binaryCloneMainGui.C
===================================================================
--- trunk/projects/BinaryCloneDetection/gui/binaryCloneMainGui.C (rev 0)
+++ trunk/projects/BinaryCloneDetection/gui/binaryCloneMainGui.C 2008-09-12 20:14:11 UTC (rev 32)
@@ -0,0 +1,17 @@
+/*
+ *
+ */
+
+#include <vector>
+#include <qrose.h>
+#include "binaryCloneGui.h"
+
+using namespace qrs;
+
+int main( int argc, char **argv )
+{
+ QROSE::init(argc,argv);
+ BinaryCloneGui binaryCloneGui;
+
+ return QROSE::exec();
+}
Modified: trunk/projects/BinaryContextLookup/Makefile.in
===================================================================
--- trunk/projects/BinaryContextLookup/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/BinaryContextLookup/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -135,7 +135,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -143,10 +144,11 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
@ROSE_USE_BINARYCONTEXTLOOKUP_TRUE at bcl_reader_DEPENDENCIES = \
@ROSE_USE_BINARYCONTEXTLOOKUP_TRUE@ $(am__DEPENDENCIES_1) \
- at ROSE_USE_BINARYCONTEXTLOOKUP_TRUE@ $(am__DEPENDENCIES_6) \
+ at ROSE_USE_BINARYCONTEXTLOOKUP_TRUE@ $(am__DEPENDENCIES_7) \
@ROSE_USE_BINARYCONTEXTLOOKUP_TRUE@ $(am__DEPENDENCIES_1)
am__bcl_writer_SOURCES_DIST = bcl_writer.C
@ROSE_USE_BINARYCONTEXTLOOKUP_TRUE at am_bcl_writer_OBJECTS = \
@@ -155,7 +157,7 @@
bcl_writer_LDADD = $(LDADD)
@ROSE_USE_BINARYCONTEXTLOOKUP_TRUE at bcl_writer_DEPENDENCIES = \
@ROSE_USE_BINARYCONTEXTLOOKUP_TRUE@ $(am__DEPENDENCIES_1) \
- at ROSE_USE_BINARYCONTEXTLOOKUP_TRUE@ $(am__DEPENDENCIES_6) \
+ at ROSE_USE_BINARYCONTEXTLOOKUP_TRUE@ $(am__DEPENDENCIES_7) \
@ROSE_USE_BINARYCONTEXTLOOKUP_TRUE@ $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
@@ -206,7 +208,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -257,8 +258,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -276,8 +275,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -288,8 +285,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -318,13 +313,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -369,6 +360,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -392,8 +385,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -440,8 +431,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -483,14 +472,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -502,32 +491,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -593,6 +583,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -638,10 +629,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/C_to_Promela/Makefile.in
===================================================================
--- trunk/projects/C_to_Promela/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/C_to_Promela/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -93,7 +93,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -110,6 +109,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -134,7 +134,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -142,7 +143,8 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -199,7 +201,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -253,8 +254,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -272,8 +271,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -284,8 +281,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -314,13 +309,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -365,6 +356,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -388,8 +381,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -436,8 +427,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -479,14 +468,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -498,32 +487,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -589,6 +579,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -634,10 +625,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/CloneDetection/Makefile.in
===================================================================
--- trunk/projects/CloneDetection/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/CloneDetection/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -132,7 +132,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -140,14 +141,15 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
cloneDetection_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
am_getSubVariants_OBJECTS = getSubVariants.$(OBJEXT)
getSubVariants_OBJECTS = $(am_getSubVariants_OBJECTS)
getSubVariants_LDADD = $(LDADD)
getSubVariants_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -196,7 +198,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -247,8 +248,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -266,8 +265,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -278,8 +275,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -308,13 +303,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -359,6 +350,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -382,8 +375,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -430,8 +421,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -473,14 +462,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -492,32 +481,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -583,6 +573,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -628,10 +619,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/DatalogAnalysis/Makefile.in
===================================================================
--- trunk/projects/DatalogAnalysis/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/DatalogAnalysis/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -161,7 +161,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -212,8 +211,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -231,8 +228,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -243,8 +238,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -273,13 +266,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -324,6 +313,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -347,8 +338,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -395,8 +384,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -438,14 +425,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -457,32 +444,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -548,6 +536,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -593,10 +582,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/DatalogAnalysis/relationTranslatorGenerator/Makefile.in
===================================================================
--- trunk/projects/DatalogAnalysis/relationTranslatorGenerator/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/DatalogAnalysis/relationTranslatorGenerator/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -181,7 +181,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -232,8 +231,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -251,8 +248,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -263,8 +258,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -293,13 +286,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -344,6 +333,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -367,8 +358,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -415,8 +404,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -458,14 +445,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -477,32 +464,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -568,6 +556,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -613,10 +602,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/DatalogAnalysis/src/DBFactories/Makefile.in
===================================================================
--- trunk/projects/DatalogAnalysis/src/DBFactories/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/DatalogAnalysis/src/DBFactories/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -177,7 +177,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -228,8 +227,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -247,8 +244,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -259,8 +254,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -289,13 +282,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -340,6 +329,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -363,8 +354,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -411,8 +400,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -454,14 +441,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -473,32 +460,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -564,6 +552,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -609,10 +598,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/DatalogAnalysis/src/Makefile.in
===================================================================
--- trunk/projects/DatalogAnalysis/src/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/DatalogAnalysis/src/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -93,7 +93,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -110,6 +109,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -138,7 +138,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -146,10 +147,11 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
@ROSE_USE_BDDBDDB_TRUE at relationTranslator_DEPENDENCIES = \
@ROSE_USE_BDDBDDB_TRUE@ $(am__DEPENDENCIES_1) \
- at ROSE_USE_BDDBDDB_TRUE@ $(am__DEPENDENCIES_6) \
+ at ROSE_USE_BDDBDDB_TRUE@ $(am__DEPENDENCIES_7) \
@ROSE_USE_BDDBDDB_TRUE@ DBFactories/libDBFactories.la \
@ROSE_USE_BDDBDDB_TRUE@ $(GENERATED_SOURCE_DIR)/libastBinaryRelations.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -209,7 +211,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -260,8 +261,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -279,8 +278,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -291,8 +288,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -321,13 +316,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -372,6 +363,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -395,8 +388,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -443,8 +434,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -486,14 +475,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -505,32 +494,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -596,6 +586,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -641,10 +632,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/DatalogAnalysis/tests/Makefile.in
===================================================================
--- trunk/projects/DatalogAnalysis/tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/DatalogAnalysis/tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/DistributedMemoryAnalysisCompass/Makefile.in
===================================================================
--- trunk/projects/DistributedMemoryAnalysisCompass/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/DistributedMemoryAnalysisCompass/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -101,7 +101,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -118,6 +117,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -144,7 +144,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -152,9 +153,10 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
@ROSE_MPI_TRUE at parallel_compass_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- at ROSE_MPI_TRUE@ $(am__DEPENDENCIES_6) \
+ at ROSE_MPI_TRUE@ $(am__DEPENDENCIES_7) \
@ROSE_MPI_TRUE@ $(compass_build_tooldir)/compass/libCompassCheckers.la \
@ROSE_MPI_TRUE@ $(am__DEPENDENCIES_1)
am__parallel_file_compass_SOURCES_DIST = parallel_file_compass.C
@@ -163,7 +165,7 @@
parallel_file_compass_OBJECTS = $(am_parallel_file_compass_OBJECTS)
parallel_file_compass_LDADD = $(LDADD)
@ROSE_MPI_TRUE at parallel_file_compass_DEPENDENCIES = \
- at ROSE_MPI_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6) \
+ at ROSE_MPI_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7) \
@ROSE_MPI_TRUE@ $(compass_build_tooldir)/compass/libCompassCheckers.la \
@ROSE_MPI_TRUE@ $(am__DEPENDENCIES_1)
am__parallel_functionBased_ASTBalance_SOURCES_DIST = \
@@ -174,7 +176,7 @@
$(am_parallel_functionBased_ASTBalance_OBJECTS)
parallel_functionBased_ASTBalance_LDADD = $(LDADD)
@ROSE_MPI_TRUE at parallel_functionBased_ASTBalance_DEPENDENCIES = \
- at ROSE_MPI_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6) \
+ at ROSE_MPI_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7) \
@ROSE_MPI_TRUE@ $(compass_build_tooldir)/compass/libCompassCheckers.la \
@ROSE_MPI_TRUE@ $(am__DEPENDENCIES_1)
am__parallel_functionBased_dynamicBalance_SOURCES_DIST = \
@@ -184,7 +186,7 @@
$(am_parallel_functionBased_dynamicBalance_OBJECTS)
parallel_functionBased_dynamicBalance_LDADD = $(LDADD)
@ROSE_MPI_TRUE at parallel_functionBased_dynamicBalance_DEPENDENCIES = \
- at ROSE_MPI_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6) \
+ at ROSE_MPI_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7) \
@ROSE_MPI_TRUE@ $(compass_build_tooldir)/compass/libCompassCheckers.la \
@ROSE_MPI_TRUE@ $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -250,7 +252,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@ $(am__append_2)
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -301,8 +302,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -320,8 +319,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -332,8 +329,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -362,13 +357,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -413,6 +404,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -436,8 +429,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -484,8 +475,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -527,14 +516,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -546,32 +535,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -637,6 +627,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -682,10 +673,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/DocumentationGenerator/Makefile.in
===================================================================
--- trunk/projects/DocumentationGenerator/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/DocumentationGenerator/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -98,7 +98,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -115,6 +114,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -143,7 +143,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -151,40 +152,41 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
classifyDeprecated_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
am_correctAllComments_OBJECTS = correctAllComments.$(OBJEXT) \
$(am__objects_1)
correctAllComments_OBJECTS = $(am_correctAllComments_OBJECTS)
correctAllComments_LDADD = $(LDADD)
correctAllComments_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
am_correctExternalComments_OBJECTS = \
correctExternalComments.$(OBJEXT) $(am__objects_1)
correctExternalComments_OBJECTS = \
$(am_correctExternalComments_OBJECTS)
correctExternalComments_LDADD = $(LDADD)
correctExternalComments_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
am_correctExternalCommentsAndCompile_OBJECTS = \
correctExternalCommentsAndCompile.$(OBJEXT) $(am__objects_1)
correctExternalCommentsAndCompile_OBJECTS = \
$(am_correctExternalCommentsAndCompile_OBJECTS)
correctExternalCommentsAndCompile_LDADD = $(LDADD)
correctExternalCommentsAndCompile_DEPENDENCIES = \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
am_createDocumentationForROSE_OBJECTS = \
createDocumentationForROSE.$(OBJEXT) $(am__objects_1)
createDocumentationForROSE_OBJECTS = \
$(am_createDocumentationForROSE_OBJECTS)
createDocumentationForROSE_LDADD = $(LDADD)
createDocumentationForROSE_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
am_docLint_OBJECTS = docLint.$(OBJEXT) $(am__objects_1)
docLint_OBJECTS = $(am_docLint_OBJECTS)
docLint_LDADD = $(LDADD)
-docLint_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+docLint_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(bin_SCRIPTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -250,7 +252,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -301,8 +302,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -320,8 +319,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -332,8 +329,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -362,13 +357,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -413,6 +404,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -436,8 +429,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -484,8 +475,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -527,14 +516,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -546,32 +535,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -637,6 +627,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -682,10 +673,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/FiniteStateModelChecker/Makefile.in
===================================================================
--- trunk/projects/FiniteStateModelChecker/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/FiniteStateModelChecker/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/MPICodeMotion/Makefile.in
===================================================================
--- trunk/projects/MPICodeMotion/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/MPICodeMotion/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -134,7 +134,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -142,9 +143,10 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
mpiCodeMotion_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -193,7 +195,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -244,8 +245,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -263,8 +262,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -275,8 +272,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -305,13 +300,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -356,6 +347,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -379,8 +372,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -427,8 +418,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -470,14 +459,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -489,32 +478,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -580,6 +570,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -625,10 +616,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/Makefile.in
===================================================================
--- trunk/projects/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -161,7 +161,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -212,8 +211,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -231,8 +228,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -243,8 +238,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -273,13 +266,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -324,6 +313,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -347,8 +338,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -395,8 +384,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -438,14 +425,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -457,32 +444,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -548,6 +536,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -593,10 +582,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/OpenMP_Translator/Makefile.in
===================================================================
--- trunk/projects/OpenMP_Translator/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/OpenMP_Translator/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -132,7 +132,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -140,9 +141,10 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
ompTranslator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -198,7 +200,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -249,8 +250,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -268,8 +267,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -280,8 +277,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -310,13 +305,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -361,6 +352,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -384,8 +377,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -432,8 +423,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -475,14 +464,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -494,32 +483,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -585,6 +575,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -630,10 +621,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/OpenMP_Translator/tests/Makefile.in
===================================================================
--- trunk/projects/OpenMP_Translator/tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/OpenMP_Translator/tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -161,7 +161,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -212,8 +211,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -231,8 +228,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -243,8 +238,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -273,13 +266,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -324,6 +313,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -347,8 +338,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -395,8 +384,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -438,14 +425,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -457,32 +444,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -548,6 +536,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -593,10 +582,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/OpenMP_Translator/tests/cvalidationsuite/Makefile.in
===================================================================
--- trunk/projects/OpenMP_Translator/tests/cvalidationsuite/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/OpenMP_Translator/tests/cvalidationsuite/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -90,7 +90,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -107,6 +106,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -210,7 +210,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -261,8 +260,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -280,8 +277,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -292,8 +287,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -322,13 +315,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -373,6 +362,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -396,8 +387,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -444,8 +433,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -487,14 +474,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -506,32 +493,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -597,6 +585,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -642,10 +631,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/OpenMP_Translator/tests/developmentTests/Makefile.in
===================================================================
--- trunk/projects/OpenMP_Translator/tests/developmentTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/OpenMP_Translator/tests/developmentTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -90,7 +90,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -107,6 +106,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -258,7 +258,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -309,8 +308,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -328,8 +325,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -340,8 +335,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -370,13 +363,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -421,6 +410,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -444,8 +435,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -492,8 +481,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -535,14 +522,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -554,32 +541,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -645,6 +633,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -690,10 +679,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/OpenMP_Translator/tests/epcc-c/Makefile.in
===================================================================
--- trunk/projects/OpenMP_Translator/tests/epcc-c/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/OpenMP_Translator/tests/epcc-c/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -172,7 +172,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -223,8 +222,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -242,8 +239,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -254,8 +249,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -284,13 +277,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -335,6 +324,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -358,8 +349,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -406,8 +395,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -449,14 +436,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -468,32 +455,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -559,6 +547,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -604,10 +593,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/BT/Makefile.in
===================================================================
--- trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/BT/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/BT/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/CG/Makefile.in
===================================================================
--- trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/CG/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/CG/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/EP/Makefile.in
===================================================================
--- trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/EP/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/EP/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/FT/Makefile.in
===================================================================
--- trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/FT/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/FT/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/IS/Makefile.in
===================================================================
--- trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/IS/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/IS/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/LU/Makefile.in
===================================================================
--- trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/LU/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/LU/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/MG/Makefile.in
===================================================================
--- trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/MG/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/MG/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/Makefile.in
===================================================================
--- trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -161,7 +161,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -212,8 +211,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -231,8 +228,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -243,8 +238,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -273,13 +266,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -324,6 +313,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -347,8 +338,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -395,8 +384,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -438,14 +425,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -457,32 +444,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -548,6 +536,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -593,10 +582,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/SP/Makefile.in
===================================================================
--- trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/SP/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/OpenMP_Translator/tests/npb2.3-omp-c/SP/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/UpcTranslation/Makefile.in
===================================================================
--- trunk/projects/UpcTranslation/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/UpcTranslation/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -132,7 +132,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -140,8 +141,9 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-roseupcc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+roseupcc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -197,7 +199,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -248,8 +249,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -267,8 +266,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -279,8 +276,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -309,13 +304,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -360,6 +351,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -383,8 +376,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -431,8 +422,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -474,14 +463,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -493,32 +482,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -584,6 +574,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -629,10 +620,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/UpcTranslation/tests/Makefile.in
===================================================================
--- trunk/projects/UpcTranslation/tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/UpcTranslation/tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/arrayOptimization/Makefile.in
===================================================================
--- trunk/projects/arrayOptimization/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/arrayOptimization/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -94,7 +94,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -111,6 +110,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -150,7 +150,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -158,9 +159,10 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-ArrayProcessor_DEPENDENCIES = libarrayOptimization.a \
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ArrayProcessor_DEPENDENCIES = libarrayOptimization.a \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -219,7 +221,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -270,8 +271,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -289,8 +288,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -301,8 +298,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -331,13 +326,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -382,6 +373,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -405,8 +398,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -453,8 +444,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -496,14 +485,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -515,32 +504,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -606,6 +596,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -651,10 +642,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/arrayOptimization/test/Makefile.in
===================================================================
--- trunk/projects/arrayOptimization/test/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/arrayOptimization/test/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -62,7 +62,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -79,6 +78,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -125,7 +125,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -176,8 +175,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -195,8 +192,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -207,8 +202,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -237,13 +230,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -288,6 +277,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -311,8 +302,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -359,8 +348,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/projects/assemblyToSourceAst/Makefile.am
===================================================================
--- trunk/projects/assemblyToSourceAst/Makefile.am 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/assemblyToSourceAst/Makefile.am 2008-09-12 20:14:11 UTC (rev 32)
@@ -5,15 +5,17 @@
INCLUDES = $(ROSE_INCLUDES)
LDADD = $(LIBS_WITH_RPATH) $(ROSE_LIBS)
-bin_PROGRAMS = x86AssemblyToCDemo
+bin_PROGRAMS = x86AssemblyToCDemo x86AssemblyToNetlist
x86AssemblyToCDemo_SOURCES = x86AssemblyToCDemo.C x86AssemblyToC.C
+x86AssemblyToNetlist_SOURCES = x86AssemblyToNetlist.C
include_HEADERS = x86AssemblyToC.h
-jeremiah-check: x86AssemblyToCDemo
+jeremiah-check: x86AssemblyToCDemo x86AssemblyToNetlist
if test -e $(top_srcdir)/developersScratchSpace/Dan/Disassembler_tests/fnord.i386; then \
./x86AssemblyToCDemo -c $(srcdir)/outputFileTemplate.C $(top_srcdir)/developersScratchSpace/Dan/Disassembler_tests/fnord.i386; \
+ ./x86AssemblyToNetlist $(top_srcdir)/developersScratchSpace/Dan/Disassembler_tests/fnord.i386; \
fi
check:
@@ -22,5 +24,5 @@
endif
-EXTRA_DIST = outputFileTemplate.C x86AssemblyToCDemo.C x86AssemblyToC.C x86AssemblyToC.h
+EXTRA_DIST = outputFileTemplate.C x86AssemblyToCDemo.C x86AssemblyToC.C x86AssemblyToC.h x86AssemblyToNetlist.C
Modified: trunk/projects/assemblyToSourceAst/Makefile.in
===================================================================
--- trunk/projects/assemblyToSourceAst/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/assemblyToSourceAst/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -67,7 +67,8 @@
$(srcdir)/Makefile.in \
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
@USE_BINARY_ANALYSIS_TESTS_TRUE at bin_PROGRAMS = \
- at USE_BINARY_ANALYSIS_TESTS_TRUE@ x86AssemblyToCDemo$(EXEEXT)
+ at USE_BINARY_ANALYSIS_TESTS_TRUE@ x86AssemblyToCDemo$(EXEEXT) \
+ at USE_BINARY_ANALYSIS_TESTS_TRUE@ x86AssemblyToNetlist$(EXEEXT)
subdir = projects/assemblyToSourceAst
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = \
@@ -94,7 +95,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -111,6 +111,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -139,7 +140,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -147,10 +149,18 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
@USE_BINARY_ANALYSIS_TESTS_TRUE at x86AssemblyToCDemo_DEPENDENCIES = \
@USE_BINARY_ANALYSIS_TESTS_TRUE@ $(am__DEPENDENCIES_1) \
- at USE_BINARY_ANALYSIS_TESTS_TRUE@ $(am__DEPENDENCIES_6)
+ at USE_BINARY_ANALYSIS_TESTS_TRUE@ $(am__DEPENDENCIES_7)
+am__x86AssemblyToNetlist_SOURCES_DIST = x86AssemblyToNetlist.C
+ at USE_BINARY_ANALYSIS_TESTS_TRUE@am_x86AssemblyToNetlist_OBJECTS = x86AssemblyToNetlist.$(OBJEXT)
+x86AssemblyToNetlist_OBJECTS = $(am_x86AssemblyToNetlist_OBJECTS)
+x86AssemblyToNetlist_LDADD = $(LDADD)
+ at USE_BINARY_ANALYSIS_TESTS_TRUE@x86AssemblyToNetlist_DEPENDENCIES = \
+ at USE_BINARY_ANALYSIS_TESTS_TRUE@ $(am__DEPENDENCIES_1) \
+ at USE_BINARY_ANALYSIS_TESTS_TRUE@ $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -161,8 +171,10 @@
$(AM_CXXFLAGS) $(CXXFLAGS)
CXXLINK = @echo " LINK $@"; $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(x86AssemblyToCDemo_SOURCES)
-DIST_SOURCES = $(am__x86AssemblyToCDemo_SOURCES_DIST)
+SOURCES = $(x86AssemblyToCDemo_SOURCES) \
+ $(x86AssemblyToNetlist_SOURCES)
+DIST_SOURCES = $(am__x86AssemblyToCDemo_SOURCES_DIST) \
+ $(am__x86AssemblyToNetlist_SOURCES_DIST)
am__include_HEADERS_DIST = x86AssemblyToC.h
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
@@ -208,7 +220,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -259,8 +270,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -278,8 +287,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -290,8 +297,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -320,13 +325,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -371,6 +372,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -394,8 +397,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -442,8 +443,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -485,14 +484,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -504,32 +503,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -595,6 +595,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -640,10 +641,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
@@ -656,9 +659,10 @@
@USE_BINARY_ANALYSIS_TESTS_TRUE at INCLUDES = $(ROSE_INCLUDES)
@USE_BINARY_ANALYSIS_TESTS_TRUE at LDADD = $(LIBS_WITH_RPATH) $(ROSE_LIBS)
@USE_BINARY_ANALYSIS_TESTS_TRUE at x86AssemblyToCDemo_SOURCES = x86AssemblyToCDemo.C x86AssemblyToC.C
+ at USE_BINARY_ANALYSIS_TESTS_TRUE@x86AssemblyToNetlist_SOURCES = x86AssemblyToNetlist.C
@USE_BINARY_ANALYSIS_TESTS_TRUE at include_HEADERS = x86AssemblyToC.h
@USE_BINARY_ANALYSIS_TESTS_TRUE at CLEANFILES = outputFileTemplate.o rose_outputFileTemplate.C
-EXTRA_DIST = outputFileTemplate.C x86AssemblyToCDemo.C x86AssemblyToC.C x86AssemblyToC.h
+EXTRA_DIST = outputFileTemplate.C x86AssemblyToCDemo.C x86AssemblyToC.C x86AssemblyToC.h x86AssemblyToNetlist.C
all: all-am
.SUFFIXES:
@@ -723,6 +727,9 @@
x86AssemblyToCDemo$(EXEEXT): $(x86AssemblyToCDemo_OBJECTS) $(x86AssemblyToCDemo_DEPENDENCIES)
@rm -f x86AssemblyToCDemo$(EXEEXT)
$(CXXLINK) $(x86AssemblyToCDemo_LDFLAGS) $(x86AssemblyToCDemo_OBJECTS) $(x86AssemblyToCDemo_LDADD) $(LIBS)
+x86AssemblyToNetlist$(EXEEXT): $(x86AssemblyToNetlist_OBJECTS) $(x86AssemblyToNetlist_DEPENDENCIES)
+ @rm -f x86AssemblyToNetlist$(EXEEXT)
+ $(CXXLINK) $(x86AssemblyToNetlist_LDFLAGS) $(x86AssemblyToNetlist_OBJECTS) $(x86AssemblyToNetlist_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -958,9 +965,10 @@
# with make distcheck rule
# -lannotationLanguageParser(appears after -lvaluePropagation)
- at USE_BINARY_ANALYSIS_TESTS_TRUE@jeremiah-check: x86AssemblyToCDemo
+ at USE_BINARY_ANALYSIS_TESTS_TRUE@jeremiah-check: x86AssemblyToCDemo x86AssemblyToNetlist
@USE_BINARY_ANALYSIS_TESTS_TRUE@ if test -e $(top_srcdir)/developersScratchSpace/Dan/Disassembler_tests/fnord.i386; then \
@USE_BINARY_ANALYSIS_TESTS_TRUE@ ./x86AssemblyToCDemo -c $(srcdir)/outputFileTemplate.C $(top_srcdir)/developersScratchSpace/Dan/Disassembler_tests/fnord.i386; \
+ at USE_BINARY_ANALYSIS_TESTS_TRUE@ ./x86AssemblyToNetlist $(top_srcdir)/developersScratchSpace/Dan/Disassembler_tests/fnord.i386; \
@USE_BINARY_ANALYSIS_TESTS_TRUE@ fi
@USE_BINARY_ANALYSIS_TESTS_TRUE at check:
Added: trunk/projects/assemblyToSourceAst/x86AssemblyToNetlist.C
===================================================================
--- trunk/projects/assemblyToSourceAst/x86AssemblyToNetlist.C (rev 0)
+++ trunk/projects/assemblyToSourceAst/x86AssemblyToNetlist.C 2008-09-12 20:14:11 UTC (rev 32)
@@ -0,0 +1,1703 @@
+#include "rose.h"
+#include "x86AssemblyToC.h"
+#include <boost/array.hpp>
+#include <cassert>
+#include <cstdio>
+
+using namespace std;
+using boost::array;
+
+static int numBytesInAsmType(SgAsmType* ty) {
+ switch (ty->variantT()) {
+ case V_SgAsmTypeByte: return 1;
+ case V_SgAsmTypeWord: return 2;
+ case V_SgAsmTypeDoubleWord: return 4;
+ case V_SgAsmTypeQuadWord: return 8;
+ default: {cerr << "Unhandled type " << ty->class_name() << " in numBytesInAsmType" << endl; abort();}
+ }
+}
+
+typedef int Var;
+#define VarList(N) boost::array<Var, (N)> // Stored LSB first, counted in bits
+// Len and similar template parameters are always in bits, not bytes
+const Var TRUE = 0x80000000, FALSE = 0;
+inline bool isConstantBool(int var) {return (var & 0x7fffffff) == 0;}
+inline int invert(int var) {if (isConstantBool(var)) return var ^ 0x80000000; else return -var;}
+template <size_t Len>
+inline VarList(Len) invertWord(const VarList(Len)& a) {
+ VarList(Len) result;
+ for (size_t i = 0; i < Len; ++i) result[i] = invert(a[i]);
+ return result;
+}
+inline Var invertMaybe(Var a, bool inv) {
+ return inv ? invert(a) : a;
+}
+inline VarList(1) single(Var a) {
+ VarList(1) result;
+ result[0] = a;
+ return result;
+}
+
+template <size_t From, size_t To, size_t InputSize>
+VarList(To - From) extract(const VarList(InputSize)& in) {
+ VarList(To - From) result;
+ for (size_t i = 0; i < To - From; ++i) {
+ result[i] = in[i + From];
+ }
+ return result;
+}
+
+template <size_t Len1, size_t Len2>
+VarList(Len1 + Len2) concat(const VarList(Len1)& a, const VarList(Len2)& b) {
+ VarList(Len1 + Len2) result;
+ for (size_t i = 0; i < Len1; ++i) result[i] = a[i];
+ for (size_t i = 0; i < Len2; ++i) result[i + Len1] = b[i];
+ return result;
+}
+
+template <size_t Len>
+struct ExtractReadHelper {
+ static VarList(Len) go(const VarList(32)& fullDWord, X86PositionInRegister pos);
+};
+
+template <> struct ExtractReadHelper<8> {
+ static VarList(8) go(const VarList(32)& fullDWord, X86PositionInRegister pos) {
+ switch (pos) {
+ case x86_regpos_low_byte: return extract<0, 8>(fullDWord);
+ case x86_regpos_high_byte: return extract<8, 16>(fullDWord);
+ default: ROSE_ASSERT (false);
+ }
+ }
+};
+
+template <> struct ExtractReadHelper<16> {
+ static VarList(16) go(const VarList(32)& fullDWord, X86PositionInRegister pos) {
+ switch (pos) {
+ case x86_regpos_word: return extract<0, 16>(fullDWord);
+ default: ROSE_ASSERT (false);
+ }
+ }
+};
+
+template <> struct ExtractReadHelper<32> {
+ static VarList(32) go(const VarList(32)& fullDWord, X86PositionInRegister pos) {
+ switch (pos) {
+ case x86_regpos_dword: return fullDWord;
+ default: ROSE_ASSERT (false);
+ }
+ }
+};
+
+template <size_t Len, size_t Offset, typename NLTranslator>
+struct WriteMemoryHelper {
+ static void go(const VarList(32)& addr, const VarList(Len)& data, NLTranslator& trans) {
+ trans.writeMemoryByte((Offset == 0 ? addr : trans.adder(addr, trans.template number<32>(Offset / 8))), extract<Offset, Offset + 8>(data));
+ WriteMemoryHelper<Len, Offset + 8, NLTranslator>::go(addr, data, trans);
+ }
+};
+
+template <size_t Len, typename NLTranslator>
+struct WriteMemoryHelper<Len, Len, NLTranslator> {
+ static void go(const VarList(32)& addr, const VarList(Len)& data, NLTranslator& trans) {}
+};
+
+struct NetlistTranslator {
+ typedef pair<X86RegisterClass, int> FullReg;
+ typedef map<FullReg, VarList(32)> RegMap;
+ typedef map<X86Flag, Var> FlagMap;
+ typedef vector<pair<VarList(32), VarList(8) > > MemoryWriteList;
+ RegMap registerMap;
+ FlagMap flagMap;
+ MemoryWriteList memoryWrites;
+ int numVariables;
+
+ int newVar() {return ++numVariables;}
+
+ template <size_t Count>
+ VarList(Count) newVars() {VarList(Count) vl; for (size_t i = 0; i < Count; ++i) vl[i] = newVar(); return vl;}
+
+ static FullReg gpr(X86GeneralPurposeRegister reg) {
+ return make_pair(x86_regclass_gpr, reg);
+ }
+
+ static FullReg ip() {
+ return make_pair(x86_regclass_ip, 0);
+ }
+
+ const VarList(32)& vars(FullReg r) const {
+ RegMap::const_iterator i = registerMap.find(r);
+ ROSE_ASSERT (i != registerMap.end());
+ return i->second;
+ }
+
+ VarList(32)& vars(FullReg r) {
+ RegMap::iterator i = registerMap.find(r);
+ ROSE_ASSERT (i != registerMap.end());
+ return i->second;
+ }
+
+ Var flag(X86Flag f) const {
+ FlagMap::const_iterator i = flagMap.find(f);
+ ROSE_ASSERT (i != flagMap.end());
+ return i->second;
+ }
+
+ Var& flag(X86Flag f) {
+ FlagMap::iterator i = flagMap.find(f);
+ ROSE_ASSERT (i != flagMap.end());
+ return i->second;
+ }
+
+ template <size_t NumBits>
+ VarList(NumBits) number(unsigned int n) {
+ VarList(NumBits) result;
+ for (size_t i = 0; i < NumBits; ++i) {
+ result[i] = (n % 2 == 1) ? TRUE : FALSE;
+ n >>= 1;
+ }
+ return result;
+ }
+
+ NetlistTranslator(): numVariables(0) {
+ for (int r = 0; r < 8; ++r) {
+ registerMap.insert(make_pair(gpr((X86GeneralPurposeRegister)r), newVars<32>()));
+ }
+ registerMap.insert(make_pair(ip(), newVars<32>()));
+ flagMap.insert(make_pair(x86flag_cf, newVar()));
+ flagMap.insert(make_pair(x86flag_pf, newVar()));
+ flagMap.insert(make_pair(x86flag_af, newVar()));
+ flagMap.insert(make_pair(x86flag_zf, newVar()));
+ flagMap.insert(make_pair(x86flag_sf, newVar()));
+ flagMap.insert(make_pair(x86flag_df, newVar()));
+ flagMap.insert(make_pair(x86flag_of, newVar()));
+ }
+
+ void addClause(const vector<Var>& cl) { // FIXME
+ vector<Var> newCl;
+ for (size_t i = 0; i < cl.size(); ++i) {
+ if (cl[i] == FALSE) {
+ } else if (cl[i] == TRUE) {
+ return;
+ } else {
+ newCl.push_back(cl[i]);
+ }
+ }
+ if (newCl.empty()) { /* FIXME */ }
+ std::sort(newCl.begin(), newCl.end());
+ printf("(");
+ for (size_t i = 0; i < newCl.size(); ++i) printf("%d ", newCl[i]);
+ printf(")\n");
+ // FIXME
+ }
+
+ template <size_t Len>
+ void addClause(const VarList(Len)& cl) {
+ vector<Var> cl2(Len);
+ for (size_t i = 0; i < Len; ++i) cl2[i] = cl[i];
+ addClause(cl2);
+ }
+
+ void condEquivalence(Var sel, Var a, Var b) {
+ VarList(3) cl;
+ cl[0] = invert(sel);
+ cl[1] = invert(a);
+ cl[2] = b;
+ addClause(cl);
+ cl[1] = a;
+ cl[2] = invert(b);
+ addClause(cl);
+ }
+
+ Var mux(Var sel, Var ifTrue, Var ifFalse) {
+ if (sel == FALSE) {
+ return ifFalse;
+ } else if (sel == TRUE) {
+ return ifTrue;
+ } else if (ifTrue == ifFalse) {
+ return ifTrue;
+ } else if (ifTrue == TRUE && ifFalse == FALSE) {
+ return sel;
+ } else if (ifTrue == FALSE && ifFalse == TRUE) {
+ return invert(sel);
+ } else {
+ Var output = newVar();
+ condEquivalence(sel, ifTrue, output);
+ condEquivalence(invert(sel), ifFalse, output);
+ return output;
+ }
+ }
+
+ template <size_t Len>
+ Var andAcross(const VarList(Len)& a) {
+ vector<Var> newA;
+ for (size_t i = 0; i < Len; ++i) {
+ if (a[i] == FALSE) {
+ return FALSE;
+ } else if (a[i] == TRUE) {
+ } else {
+ newA.push_back(a[i]);
+ }
+ }
+ if (newA.size() == 1) {
+ return newA[0];
+ }
+ if (newA.empty()) return TRUE;
+ Var output = newVar();
+ for (size_t i = 0; i < newA.size(); ++i) {
+ VarList(2) cl1;
+ cl1[0] = invert(output);
+ cl1[1] = newA[i];
+ addClause(cl1);
+ }
+ vector<Var> cl2;
+ for (size_t i = 0; i < newA.size(); ++i) {
+ cl2.push_back(invert(newA[i]));
+ }
+ cl2.push_back(output);
+ addClause(cl2);
+ return output;
+ }
+
+ Var andGate(Var a, Var b) {
+ VarList(2) inputs;
+ inputs[0] = a;
+ inputs[1] = b;
+ return andAcross(inputs);
+ }
+
+ Var nandGate(Var a, Var b) {
+ return invert(andGate(a, b));
+ }
+
+ Var orGate(Var a, Var b) {
+ return invert(andGate(invert(a), invert(b)));
+ }
+
+ template <size_t Len>
+ Var orAcross(const VarList(Len)& a) {
+ VarList(Len) aInv = invertWord(a);
+ return invert(andAcross(aInv));
+ }
+
+ Var norGate(Var a, Var b) {
+ return invert(orGate(a, b));
+ }
+
+ template <size_t Len>
+ Var norAcross(const VarList(Len)& a) {
+ return invert(orAcross(a));
+ }
+
+ Var xorGate(Var a, Var b) {
+ return mux(a, invert(b), b);
+ }
+
+ template <size_t Len>
+ Var xorAcross(const VarList(Len)& a) {
+ Var result = (Len == 0 ? FALSE : a[0]);
+ for (size_t i = 1; i < Len; ++i) result = xorGate(result, a[i]);
+ return result;
+ }
+
+ template <size_t Len>
+ VarList(Len) invertWord(const VarList(Len)& a) {
+ VarList(Len) result;
+ for (size_t i = 0; i < Len; ++i) result[i] = invert(a[i]);
+ return result;
+ }
+
+ template <size_t Len>
+ VarList(Len) andWords(const VarList(Len)& a, const VarList(Len)& b) {
+ VarList(Len) output;
+ for (size_t i = 0; i < Len; ++i) {
+ output[i] = andGate(a[i], b[i]);
+ }
+ return output;
+ }
+
+ template <size_t Len>
+ VarList(Len) orWords(const VarList(Len)& a, const VarList(Len)& b) {
+ VarList(Len) output;
+ for (size_t i = 0; i < Len; ++i) {
+ output[i] = orGate(a[i], b[i]);
+ }
+ return output;
+ }
+
+ template <size_t Len>
+ VarList(Len) xorWords(const VarList(Len)& a, const VarList(Len)& b) {
+ VarList(Len) output;
+ for (size_t i = 0; i < Len; ++i) {
+ output[i] = xorGate(a[i], b[i]);
+ }
+ return output;
+ }
+
+ template <size_t NBits>
+ Var equal(const VarList(NBits)& a, const VarList(NBits)& b) {
+ return norAcross(xorWords(a, b));
+ }
+
+ template <size_t NBits>
+ VarList(NBits) ite(Var cond, const VarList(NBits)& ifTrue, const VarList(NBits)& ifFalse) {
+ VarList(NBits) output;
+ for (size_t i = 0; i < NBits; ++i) {
+ output[i] = mux(cond, ifTrue[i], ifFalse[i]);
+ }
+ return output;
+ }
+
+ template <size_t NBits>
+ VarList(NBits) adder(const VarList(NBits)& a, const VarList(NBits)& b, Var carryIn = FALSE, VarList(NBits)* carriesOutOpt = NULL) {
+ if (carriesOutOpt != NULL) {
+ *carriesOutOpt = newVars<NBits>(); // FIXME
+ }
+ return newVars<NBits>(); // FIXME
+ }
+
+ template <size_t Len1, size_t Len2>
+ VarList(Len1 + Len2) signedMultiplier(const VarList(Len1)& a, const VarList(Len2)& b) {
+ return newVars<Len1 + Len2>(); // FIXME
+ }
+
+ template <size_t Len1, size_t Len2>
+ VarList(Len1 + Len2) unsignedMultiplier(const VarList(Len1)& a, const VarList(Len2)& b) {
+ return newVars<Len1 + Len2>(); // FIXME
+ }
+
+ template <size_t Len1, size_t Len2>
+ VarList(Len1 + Len2) signedDivider(const VarList(Len1)& dividend, const VarList(Len2)& divisor) {
+ // Returns Len1 bits quotient, Len2 bits remainder concatenated
+ return newVars<Len1 + Len2>(); // FIXME
+ }
+
+ template <size_t Len1, size_t Len2>
+ VarList(Len1 + Len2) unsignedDivider(const VarList(Len1)& dividend, const VarList(Len2)& divisor) {
+ // Returns Len1 bits quotient, Len2 bits remainder concatenated
+ return newVars<Len1 + Len2>(); // FIXME
+ }
+
+ template <size_t Len, size_t SCLen>
+ VarList(Len) rightShifter(const VarList(Len)& in, const VarList(SCLen)& shiftCount) {
+ // Logarithmic shifter
+ VarList(Len) result = in;
+ for (size_t scBit = SCLen, pow2scBit = 1 << (SCLen - 1); scBit > 0; --scBit, pow2scBit >>= 1) {
+ VarList(Len) resultCopy = result;
+ for (size_t i = 0; i < Len; ++i) {
+ resultCopy[i] = mux(shiftCount[scBit - 1], (i >= pow2scBit ? result[i - pow2scBit] : FALSE), result[i]);
+ }
+ result = resultCopy;
+ }
+ return result;
+ }
+
+ template <size_t Len, size_t SCLen>
+ VarList(Len) leftShifter(const VarList(Len)& in, const VarList(SCLen)& shiftCount) {
+ // Logarithmic shifter
+ VarList(Len) result = in;
+ for (size_t scBit = SCLen, pow2scBit = 1 << (SCLen - 1); scBit > 0; --scBit, pow2scBit >>= 1) {
+ VarList(Len) resultCopy = result;
+ for (size_t i = 0; i < Len; ++i) {
+ resultCopy[i] = mux(shiftCount[scBit - 1], (i + pow2scBit >= Len ? FALSE : result[i + pow2scBit]), result[i]);
+ }
+ result = resultCopy;
+ }
+ return result;
+ }
+
+ template <size_t Len, size_t SCLen>
+ VarList(Len) arithmeticLeftShifter(const VarList(Len)& in, const VarList(SCLen)& shiftCount) {
+ // Logarithmic shifter
+ VarList(Len) result = in;
+ for (size_t scBit = SCLen, pow2scBit = 1 << (SCLen - 1); scBit > 0; --scBit, pow2scBit >>= 1) {
+ VarList(Len) resultCopy = result;
+ for (size_t i = 0; i < Len; ++i) {
+ resultCopy[i] = mux(shiftCount[scBit - 1], (i + pow2scBit >= Len ? result[Len - 1] : result[i + pow2scBit]), result[i]);
+ }
+ result = resultCopy;
+ }
+ return result;
+ }
+
+ template <size_t Len, size_t SCLen>
+ VarList(Len) rightRotater(const VarList(Len)& in, const VarList(SCLen)& shiftCount) {
+ // Logarithmic shifter
+ VarList(Len) result = in;
+ for (size_t scBit = SCLen, pow2scBit = 1 << (SCLen - 1); scBit > 0; --scBit, pow2scBit >>= 1) {
+ VarList(Len) resultCopy = result;
+ for (size_t i = 0; i < Len; ++i) {
+ resultCopy[i] = mux(shiftCount[scBit - 1], result[(i - pow2scBit + Len) % Len], result[i]);
+ }
+ result = resultCopy;
+ }
+ return result;
+ }
+
+ template <size_t Len, size_t SCLen>
+ VarList(Len) leftRotater(const VarList(Len)& in, const VarList(SCLen)& shiftCount) {
+ // Logarithmic shifter
+ VarList(Len) result = in;
+ for (size_t scBit = SCLen, pow2scBit = 1 << (SCLen - 1); scBit > 0; --scBit, pow2scBit >>= 1) {
+ VarList(Len) resultCopy = result;
+ for (size_t i = 0; i < Len; ++i) {
+ resultCopy[i] = mux(shiftCount[scBit - 1], result[(i + pow2scBit) % Len], result[i]);
+ }
+ result = resultCopy;
+ }
+ return result;
+ }
+
+ template <size_t Len>
+ VarList(Len) bitReverse(const VarList(Len)& in) {
+ VarList(Len) result;
+ for (size_t i = Len; i > 0; --i) {
+ result[i - 1] = in[Len - i];
+ }
+ return result;
+ }
+
+ template <size_t Len>
+ VarList(Len) leastSignificantSetBit(const VarList(Len)& in) {
+ VarList(Len) result = number<Len>(0);
+ for (size_t i = Len; i > 0; --i) {
+ result = ite(in[i - 1], number<Len>(i - 1), result);
+ }
+ return result;
+ }
+
+ template <size_t Len> // In bits
+ VarList(Len) readMemory(const VarList(32)& addr) {
+ VarList(Len) result;
+ for (size_t i = 0; i < Len / 8; ++i) {
+ VarList(8) thisByte = readMemoryByte(adder(addr, number<32>(i)));
+ for (size_t j = 0; j < 8; ++j) {
+ result[i * 8 + j] = thisByte[j];
+ }
+ }
+ return result;
+ }
+
+ VarList(32) readEffectiveAddress(SgAsmExpression* expr) {
+ assert (isSgAsmMemoryReferenceExpression(expr));
+ return read<32>(isSgAsmMemoryReferenceExpression(expr)->get_address());
+ }
+
+ VarList(8) readMemoryByte(const VarList(32)& addr) {
+ VarList(8) result = newVars<8>();
+ for (size_t i = 0; i < memoryWrites.size(); ++i) {
+ result = ite(equal(addr, memoryWrites[i].first), memoryWrites[i].second, result);
+ }
+ return result;
+ }
+
+ void writeMemoryByte(const VarList(32)& addr, const VarList(8)& data) {
+ memoryWrites.push_back(make_pair(addr, data));
+ }
+
+ template <size_t Len>
+ void writeMemory(const VarList(32)& addr, const VarList(Len)& data) {
+ WriteMemoryHelper<Len, 0, NetlistTranslator>::go(addr, data, *this);
+ }
+
+ template <size_t Len>
+ VarList(Len) read(SgAsmExpression* e) {
+ switch (e->variantT()) {
+ case V_SgAsmx86RegisterReferenceExpression: {
+ SgAsmx86RegisterReferenceExpression* rre = isSgAsmx86RegisterReferenceExpression(e);
+ switch (rre->get_register_class()) {
+ case x86_regclass_gpr: {
+ X86GeneralPurposeRegister reg = (X86GeneralPurposeRegister)(rre->get_register_number());
+ return extractRead<Len>(vars(gpr(reg)), rre->get_position_in_register());
+ }
+ default: fprintf(stderr, "Bad register class %u\n", rre->get_register_class()); abort();
+ }
+ break;
+ }
+ case V_SgAsmBinaryAdd: {
+ return adder(read<Len>(isSgAsmBinaryAdd(e)->get_lhs()), read<Len>(isSgAsmBinaryAdd(e)->get_rhs()));
+ }
+ case V_SgAsmBinaryMultiply: {
+ SgAsmByteValueExpression* rhs = isSgAsmByteValueExpression(isSgAsmBinaryMultiply(e)->get_rhs());
+ ROSE_ASSERT (rhs);
+ SgAsmExpression* lhs = isSgAsmBinaryMultiply(e)->get_lhs();
+ switch (rhs->get_value()) {
+ case 1: return read<Len>(lhs);
+ case 2: return concat(number<1>(0), extract<0, Len - 1>(read<Len>(lhs)));
+ case 4: return concat(number<2>(0), extract<0, Len - 2>(read<Len>(lhs)));
+ case 8: return concat(number<3>(0), extract<0, Len - 3>(read<Len>(lhs)));
+ default: ROSE_ASSERT (!"Bad scaling factor");
+ }
+ }
+ case V_SgAsmMemoryReferenceExpression: {
+ return readMemory<Len>(readEffectiveAddress(e));
+ }
+ case V_SgAsmByteValueExpression: {
+ uint64_t val = isSgAsmByteValueExpression(e)->get_value();
+ ROSE_ASSERT ((val >> Len) == 0);
+ return number<Len>((unsigned int)(val));
+ }
+ case V_SgAsmWordValueExpression: {
+ uint64_t val = isSgAsmWordValueExpression(e)->get_value();
+ ROSE_ASSERT ((val >> Len) == 0);
+ return number<Len>((unsigned int)(val));
+ }
+ case V_SgAsmDoubleWordValueExpression: {
+ uint64_t val = isSgAsmDoubleWordValueExpression(e)->get_value();
+ ROSE_ASSERT ((val >> Len) == 0);
+ return number<Len>((unsigned int)(val));
+ }
+ case V_SgAsmQuadWordValueExpression: {
+ uint64_t val = isSgAsmQuadWordValueExpression(e)->get_value();
+ ROSE_ASSERT ((val >> Len) == 0);
+ return number<Len>((unsigned int)(val));
+ }
+ default: fprintf(stderr, "Bad variant %s in read\n", e->class_name().c_str()); abort();
+ }
+ }
+
+ template <size_t Len>
+ void write(SgAsmExpression* e, const VarList(Len)& value) {
+ switch (e->variantT()) {
+ case V_SgAsmx86RegisterReferenceExpression: {
+ SgAsmx86RegisterReferenceExpression* rre = isSgAsmx86RegisterReferenceExpression(e);
+ switch (rre->get_register_class()) {
+ case x86_regclass_gpr: {
+ X86GeneralPurposeRegister reg = (X86GeneralPurposeRegister)(rre->get_register_number());
+ VarList(32) newValue = blendInWrittenValue<Len>(vars(gpr(reg)), rre->get_position_in_register(), value);
+ vars(gpr(reg)) = newValue;
+ break;
+ }
+ default: fprintf(stderr, "Bad register class %u\n", rre->get_register_class()); abort();
+ }
+ break;
+ }
+ case V_SgAsmMemoryReferenceExpression: {
+ writeMemory<Len>(readEffectiveAddress(e), value);
+ break;
+ }
+ default: fprintf(stderr, "Bad variant %s in write\n", e->class_name().c_str()); abort();
+ }
+ }
+
+ template <size_t Len>
+ VarList(Len) extractRead(const VarList(32)& fullDWord, X86PositionInRegister pos) const {
+ return ExtractReadHelper<Len>::go(fullDWord, pos);
+ }
+
+ template <size_t Len>
+ VarList(32) blendInWrittenValue(const VarList(32)& oldDWord, X86PositionInRegister pos, const VarList(Len)& newValue) const {
+ switch (pos) {
+ case x86_regpos_all: // The copy is for static type safety
+ case x86_regpos_dword: {
+ ROSE_ASSERT (Len == 32);
+ VarList(32) newVal = oldDWord;
+ for (size_t i = 0; i < 32; ++i) newVal[i] = newValue[i];
+ return newVal;
+ }
+
+ case x86_regpos_word: {
+ ROSE_ASSERT (Len == 16);
+ VarList(32) newVal = oldDWord;
+ for (size_t i = 0; i < 16; ++i) newVal[i] = newValue[i];
+ return newVal;
+ }
+
+ case x86_regpos_low_byte: {
+ ROSE_ASSERT (Len == 8);
+ VarList(32) newVal = oldDWord;
+ for (size_t i = 0; i < 8; ++i) newVal[i] = newValue[i];
+ return newVal;
+ }
+
+ case x86_regpos_high_byte: {
+ ROSE_ASSERT (Len == 8);
+ VarList(32) newVal = oldDWord;
+ for (size_t i = 0; i < 8; ++i) newVal[i + 8] = newValue[i];
+ return newVal;
+ }
+
+ default: ROSE_ASSERT (!"Bad position in register");
+ }
+ }
+
+ template <size_t Len>
+ void setFlagsForResult(const VarList(Len)& result) {
+ flag(x86flag_pf) = xorAcross(extract<0, 8>(result));
+ flag(x86flag_sf) = result[Len - 1];
+ flag(x86flag_zf) = norAcross(result);
+ }
+
+ template <size_t Len>
+ VarList(Len) doAddOperation(const VarList(Len)& a, const VarList(Len)& b, bool invertCarries, Var carryIn = FALSE) { // Does add (subtract with two's complement input and invertCarries set), and sets correct flags
+ VarList(Len) carries;
+ VarList(Len) result = adder(a, b, invertMaybe(carryIn, invertCarries), &carries);
+ setFlagsForResult(result);
+ flag(x86flag_af) = invertMaybe(carries[3], invertCarries);
+ flag(x86flag_cf) = invertMaybe(carries[Len - 1], invertCarries);
+ flag(x86flag_of) = xorGate(carries[Len - 1], carries[Len - 2]);
+ return result;
+ }
+
+ template <size_t Len>
+ VarList(Len) doIncOperation(const VarList(Len)& a, bool dec, bool setCarry) { // Does inc (dec with dec set), and sets correct flags
+ VarList(Len) carries;
+ VarList(Len) result = adder(a, number<Len>(dec ? -1 : 1), FALSE, &carries);
+ setFlagsForResult(result);
+ flag(x86flag_af) = invertMaybe(carries[3], dec);
+ flag(x86flag_of) = xorGate(carries[Len - 1], carries[Len - 2]);
+ if (setCarry) flag(x86flag_cf) = carries[Len - 1];
+ return result;
+ }
+
+ void translate(SgAsmx86Instruction* insn) {
+ vars(ip()) = number<32>((unsigned int)(insn->get_address() + insn->get_raw_bytes().size()));
+ X86InstructionKind kind = insn->get_kind();
+ const SgAsmExpressionPtrList& operands = insn->get_operandList()->get_operands();
+ switch (kind) {
+ case x86_mov: {
+ ROSE_ASSERT (operands.size() == 2);
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 1: write(operands[0], read<8>(operands[1])); break;
+ case 2: write(operands[0], read<16>(operands[1])); break;
+ case 4: write(operands[0], read<32>(operands[1])); break;
+ default: ROSE_ASSERT ("Bad size"); break;
+ }
+ break;
+ }
+ case x86_xchg: {
+ ROSE_ASSERT (operands.size() == 2);
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 1: {VarList(8) temp = read<8>(operands[1]); write(operands[1], read<8>(operands[0])); write(operands[0], temp); break;}
+ case 2: {VarList(16) temp = read<16>(operands[1]); write(operands[1], read<16>(operands[0])); write(operands[0], temp); break;}
+ case 4: {VarList(32) temp = read<32>(operands[1]); write(operands[1], read<32>(operands[0])); write(operands[0], temp); break;}
+ default: ROSE_ASSERT ("Bad size"); break;
+ }
+ break;
+ }
+ case x86_movzx: {
+ ROSE_ASSERT (operands.size() == 2);
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 2: write(operands[0], concat(read<8>(operands[1]), number<8>(0))); break;
+ case 4: {
+ switch (numBytesInAsmType(operands[1]->get_type())) {
+ case 1: write(operands[0], concat(read<8>(operands[1]), number<24>(0))); break;
+ case 2: write(operands[0], concat(read<16>(operands[1]), number<16>(0))); break;
+ default: ROSE_ASSERT ("Bad size");
+ }
+ break;
+ }
+ default: ROSE_ASSERT ("Bad size"); break;
+ }
+ break;
+ }
+ case x86_movsx: {
+ ROSE_ASSERT (operands.size() == 2);
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 2: {
+ VarList(8) op1 = read<8>(operands[1]);
+ VarList(16) result;
+ for (size_t i = 0; i < 16; ++i) result[i] = (i < 8 ? op1[i] : op1[7]);
+ write(operands[0], result);
+ break;
+ }
+ case 4: {
+ switch (numBytesInAsmType(operands[1]->get_type())) {
+ case 1: {
+ VarList(8) op1 = read<8>(operands[1]);
+ VarList(32) result;
+ for (size_t i = 0; i < 32; ++i) result[i] = (i < 8 ? op1[i] : op1[7]);
+ write(operands[0], result);
+ break;
+ }
+ case 2: {
+ VarList(16) op1 = read<16>(operands[1]);
+ VarList(32) result;
+ for (size_t i = 0; i < 32; ++i) result[i] = (i < 16 ? op1[i] : op1[15]);
+ write(operands[0], result);
+ break;
+ }
+ default: ROSE_ASSERT ("Bad size");
+ }
+ break;
+ }
+ default: ROSE_ASSERT ("Bad size"); break;
+ }
+ break;
+ }
+ case x86_cbw: {
+ ROSE_ASSERT (operands.size() == 0);
+ VarList(32) result = vars(gpr(x86_gpr_ax));
+ Var signbit = result[7];
+ for (size_t i = 8; i < 15; ++i) result[i] = signbit;
+ vars(gpr(x86_gpr_ax)) = result;
+ break;
+ }
+ case x86_cwde: {
+ ROSE_ASSERT (operands.size() == 0);
+ VarList(32) result = vars(gpr(x86_gpr_ax));
+ Var signbit = result[15];
+ for (size_t i = 16; i < 32; ++i) result[i] = signbit;
+ vars(gpr(x86_gpr_ax)) = result;
+ break;
+ }
+ case x86_cwd: {
+ ROSE_ASSERT (operands.size() == 0);
+ VarList(32) result = vars(gpr(x86_gpr_dx));
+ Var signbit = vars(gpr(x86_gpr_ax))[15];
+ for (size_t i = 0; i < 15; ++i) result[i] = signbit;
+ vars(gpr(x86_gpr_dx)) = result;
+ break;
+ }
+ case x86_cdq: {
+ ROSE_ASSERT (operands.size() == 0);
+ VarList(32) result;
+ Var signbit = vars(gpr(x86_gpr_ax))[31];
+ for (size_t i = 0; i < 32; ++i) result[i] = signbit;
+ vars(gpr(x86_gpr_dx)) = result;
+ break;
+ }
+ case x86_lea: {
+ ROSE_ASSERT (operands.size() == 2);
+ write(operands[0], readEffectiveAddress(operands[1]));
+ break;
+ }
+ case x86_and: {
+ ROSE_ASSERT (operands.size() == 2);
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 1: {
+ VarList(8) result = andWords(read<8>(operands[0]), read<8>(operands[1]));
+ setFlagsForResult(result);
+ write(operands[0], result);
+ break;
+ }
+ case 2: {
+ VarList(16) result = andWords(read<16>(operands[0]), read<16>(operands[1]));
+ setFlagsForResult(result);
+ write(operands[0], result);
+ break;
+ }
+ case 4: {
+ VarList(32) result = andWords(read<32>(operands[0]), read<32>(operands[1]));
+ setFlagsForResult(result);
+ write(operands[0], result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size"); break;
+ }
+ flag(x86flag_of) = FALSE;
+ flag(x86flag_af) = FALSE; // Undefined
+ flag(x86flag_cf) = FALSE;
+ break;
+ }
+ case x86_or: {
+ ROSE_ASSERT (operands.size() == 2);
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 1: {
+ VarList(8) result = orWords(read<8>(operands[0]), read<8>(operands[1]));
+ setFlagsForResult(result);
+ write(operands[0], result);
+ break;
+ }
+ case 2: {
+ VarList(16) result = orWords(read<16>(operands[0]), read<16>(operands[1]));
+ setFlagsForResult(result);
+ write(operands[0], result);
+ break;
+ }
+ case 4: {
+ VarList(32) result = orWords(read<32>(operands[0]), read<32>(operands[1]));
+ setFlagsForResult(result);
+ write(operands[0], result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size"); break;
+ }
+ flag(x86flag_of) = FALSE;
+ flag(x86flag_af) = FALSE; // Undefined
+ flag(x86flag_cf) = FALSE;
+ break;
+ }
+ case x86_test: {
+ ROSE_ASSERT (operands.size() == 2);
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 1: {
+ VarList(8) result = andWords(read<8>(operands[0]), read<8>(operands[1]));
+ setFlagsForResult(result);
+ break;
+ }
+ case 2: {
+ VarList(16) result = andWords(read<16>(operands[0]), read<16>(operands[1]));
+ setFlagsForResult(result);
+ break;
+ }
+ case 4: {
+ VarList(32) result = andWords(read<32>(operands[0]), read<32>(operands[1]));
+ setFlagsForResult(result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size"); break;
+ }
+ flag(x86flag_of) = FALSE;
+ flag(x86flag_af) = FALSE; // Undefined
+ flag(x86flag_cf) = FALSE;
+ break;
+ }
+ case x86_xor: {
+ ROSE_ASSERT (operands.size() == 2);
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 1: {
+ VarList(8) result = xorWords(read<8>(operands[0]), read<8>(operands[1]));
+ setFlagsForResult(result);
+ write(operands[0], result);
+ break;
+ }
+ case 2: {
+ VarList(16) result = xorWords(read<16>(operands[0]), read<16>(operands[1]));
+ setFlagsForResult(result);
+ write(operands[0], result);
+ break;
+ }
+ case 4: {
+ VarList(32) result = xorWords(read<32>(operands[0]), read<32>(operands[1]));
+ setFlagsForResult(result);
+ write(operands[0], result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size"); break;
+ }
+ flag(x86flag_of) = FALSE;
+ flag(x86flag_af) = FALSE; // Undefined
+ flag(x86flag_cf) = FALSE;
+ break;
+ }
+ case x86_not: {
+ ROSE_ASSERT (operands.size() == 1);
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 1: {
+ VarList(8) result = invertWord(read<8>(operands[0]));
+ write(operands[0], result);
+ break;
+ }
+ case 2: {
+ VarList(16) result = invertWord(read<16>(operands[0]));
+ write(operands[0], result);
+ break;
+ }
+ case 4: {
+ VarList(32) result = invertWord(read<32>(operands[0]));
+ write(operands[0], result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size"); break;
+ }
+ break;
+ }
+ case x86_add: {
+ ROSE_ASSERT (operands.size() == 2);
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 1: {
+ VarList(8) result = doAddOperation(read<8>(operands[0]), read<8>(operands[1]), false);
+ write(operands[0], result);
+ break;
+ }
+ case 2: {
+ VarList(16) result = doAddOperation(read<16>(operands[0]), read<16>(operands[1]), false);
+ write(operands[0], result);
+ break;
+ }
+ case 4: {
+ VarList(32) result = doAddOperation(read<32>(operands[0]), read<32>(operands[1]), false);
+ write(operands[0], result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size"); break;
+ }
+ break;
+ }
+ case x86_adc: {
+ ROSE_ASSERT (operands.size() == 2);
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 1: {
+ VarList(8) result = doAddOperation(read<8>(operands[0]), read<8>(operands[1]), false, flag(x86flag_cf));
+ write(operands[0], result);
+ break;
+ }
+ case 2: {
+ VarList(16) result = doAddOperation(read<16>(operands[0]), read<16>(operands[1]), false, flag(x86flag_cf));
+ write(operands[0], result);
+ break;
+ }
+ case 4: {
+ VarList(32) result = doAddOperation(read<32>(operands[0]), read<32>(operands[1]), false, flag(x86flag_cf));
+ write(operands[0], result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size"); break;
+ }
+ break;
+ }
+ case x86_sub: {
+ ROSE_ASSERT (operands.size() == 2);
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 1: {
+ VarList(8) result = doAddOperation(read<8>(operands[0]), invertWord(read<8>(operands[1])), true);
+ write(operands[0], result);
+ break;
+ }
+ case 2: {
+ VarList(16) result = doAddOperation(read<16>(operands[0]), invertWord(read<16>(operands[1])), true);
+ write(operands[0], result);
+ break;
+ }
+ case 4: {
+ VarList(32) result = doAddOperation(read<32>(operands[0]), invertWord(read<32>(operands[1])), true);
+ write(operands[0], result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size"); break;
+ }
+ break;
+ }
+ case x86_sbb: {
+ ROSE_ASSERT (operands.size() == 2);
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 1: {
+ VarList(8) result = doAddOperation(read<8>(operands[0]), invertWord(read<8>(operands[1])), true, flag(x86flag_cf));
+ write(operands[0], result);
+ break;
+ }
+ case 2: {
+ VarList(16) result = doAddOperation(read<16>(operands[0]), invertWord(read<16>(operands[1])), true, flag(x86flag_cf));
+ write(operands[0], result);
+ break;
+ }
+ case 4: {
+ VarList(32) result = doAddOperation(read<32>(operands[0]), invertWord(read<32>(operands[1])), true, flag(x86flag_cf));
+ write(operands[0], result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size"); break;
+ }
+ break;
+ }
+ case x86_cmp: {
+ ROSE_ASSERT (operands.size() == 2);
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 1: {
+ VarList(8) result = doAddOperation(read<8>(operands[0]), invertWord(read<8>(operands[1])), true);
+ break;
+ }
+ case 2: {
+ VarList(16) result = doAddOperation(read<16>(operands[0]), invertWord(read<16>(operands[1])), true);
+ break;
+ }
+ case 4: {
+ VarList(32) result = doAddOperation(read<32>(operands[0]), invertWord(read<32>(operands[1])), true);
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size"); break;
+ }
+ break;
+ }
+ case x86_neg: {
+ ROSE_ASSERT (operands.size() == 1);
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 1: {
+ VarList(8) result = doIncOperation(invertWord(read<8>(operands[0])), false, true);
+ write(operands[0], result);
+ break;
+ }
+ case 2: {
+ VarList(16) result = doIncOperation(invertWord(read<16>(operands[0])), false, true);
+ write(operands[0], result);
+ break;
+ }
+ case 4: {
+ VarList(32) result = doIncOperation(invertWord(read<32>(operands[0])), false, true);
+ write(operands[0], result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size"); break;
+ }
+ break;
+ }
+ case x86_inc: {
+ ROSE_ASSERT (operands.size() == 1);
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 1: {
+ VarList(8) result = doIncOperation(read<8>(operands[0]), false, false);
+ write(operands[0], result);
+ break;
+ }
+ case 2: {
+ VarList(16) result = doIncOperation(read<16>(operands[0]), false, false);
+ write(operands[0], result);
+ break;
+ }
+ case 4: {
+ VarList(32) result = doIncOperation(read<32>(operands[0]), false, false);
+ write(operands[0], result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size"); break;
+ }
+ break;
+ }
+ case x86_dec: {
+ ROSE_ASSERT (operands.size() == 1);
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 1: {
+ VarList(8) result = doIncOperation(read<8>(operands[0]), true, false);
+ write(operands[0], result);
+ break;
+ }
+ case 2: {
+ VarList(16) result = doIncOperation(read<16>(operands[0]), true, false);
+ write(operands[0], result);
+ break;
+ }
+ case 4: {
+ VarList(32) result = doIncOperation(read<32>(operands[0]), true, false);
+ write(operands[0], result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size"); break;
+ }
+ break;
+ }
+ case x86_shl: {
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 1: {
+ VarList(8) op = read<8>(operands[0]);
+ VarList(5) shiftCount = extract<0, 5>(read<8>(operands[1]));
+ VarList(9) opWithCf = concat(op, single(flag(x86flag_cf)));
+ VarList(9) outputWithCf = rightShifter(opWithCf, shiftCount); // Because op is LSB first
+ flag(x86flag_cf) = outputWithCf[8];
+ flag(x86flag_of) = xorGate(outputWithCf[7], outputWithCf[8]);
+ write(operands[0], extract<0, 8>(outputWithCf));
+ setFlagsForResult(extract<0, 8>(outputWithCf));
+ flag(x86flag_af) = FALSE; // Undefined
+ break;
+ }
+ case 2: {
+ VarList(16) op = read<16>(operands[0]);
+ VarList(5) shiftCount = extract<0, 5>(read<8>(operands[1]));
+ VarList(17) opWithCf = concat(op, single(flag(x86flag_cf)));
+ VarList(17) outputWithCf = rightShifter(opWithCf, shiftCount); // Because op is LSB first
+ flag(x86flag_cf) = outputWithCf[16];
+ flag(x86flag_of) = xorGate(outputWithCf[15], outputWithCf[16]);
+ write(operands[0], extract<0, 16>(outputWithCf));
+ setFlagsForResult(extract<0, 16>(outputWithCf));
+ flag(x86flag_af) = FALSE; // Undefined
+ break;
+ }
+ case 4: {
+ VarList(32) op = read<32>(operands[0]);
+ VarList(5) shiftCount = extract<0, 5>(read<8>(operands[1]));
+ VarList(33) opWithCf = concat(op, single(flag(x86flag_cf)));
+ VarList(33) outputWithCf = rightShifter(opWithCf, shiftCount); // Because op is LSB first
+ flag(x86flag_cf) = outputWithCf[32];
+ flag(x86flag_of) = xorGate(outputWithCf[31], outputWithCf[32]);
+ write(operands[0], extract<0, 32>(outputWithCf));
+ setFlagsForResult(extract<0, 32>(outputWithCf));
+ flag(x86flag_af) = FALSE; // Undefined
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size");
+ }
+ break;
+ }
+ case x86_shr: {
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 1: {
+ VarList(8) op = read<8>(operands[0]);
+ VarList(5) shiftCount = extract<0, 5>(read<8>(operands[1]));
+ VarList(9) opWithCf = concat(op, single(flag(x86flag_cf)));
+ VarList(9) outputWithCf = leftShifter(opWithCf, shiftCount); // Because op is LSB first
+ flag(x86flag_cf) = outputWithCf[8];
+ flag(x86flag_of) = xorGate(outputWithCf[7], outputWithCf[8]);
+ write(operands[0], extract<0, 8>(outputWithCf));
+ setFlagsForResult(extract<0, 8>(outputWithCf));
+ flag(x86flag_af) = FALSE; // Undefined
+ break;
+ }
+ case 2: {
+ VarList(16) op = read<16>(operands[0]);
+ VarList(5) shiftCount = extract<0, 5>(read<8>(operands[1]));
+ VarList(17) opWithCf = concat(op, single(flag(x86flag_cf)));
+ VarList(17) outputWithCf = leftShifter(opWithCf, shiftCount); // Because op is LSB first
+ flag(x86flag_cf) = outputWithCf[16];
+ flag(x86flag_of) = xorGate(outputWithCf[15], outputWithCf[16]);
+ write(operands[0], extract<0, 16>(outputWithCf));
+ setFlagsForResult(extract<0, 16>(outputWithCf));
+ flag(x86flag_af) = FALSE; // Undefined
+ break;
+ }
+ case 4: {
+ VarList(32) op = read<32>(operands[0]);
+ VarList(5) shiftCount = extract<0, 5>(read<8>(operands[1]));
+ VarList(33) opWithCf = concat(op, single(flag(x86flag_cf)));
+ VarList(33) outputWithCf = leftShifter(opWithCf, shiftCount); // Because op is LSB first
+ flag(x86flag_cf) = outputWithCf[32];
+ flag(x86flag_of) = xorGate(outputWithCf[31], outputWithCf[32]);
+ write(operands[0], extract<0, 32>(outputWithCf));
+ setFlagsForResult(extract<0, 32>(outputWithCf));
+ flag(x86flag_af) = FALSE; // Undefined
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size");
+ }
+ break;
+ }
+ case x86_sar: {
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 1: {
+ VarList(8) op = read<8>(operands[0]);
+ VarList(5) shiftCount = extract<0, 5>(read<8>(operands[1]));
+ VarList(9) opWithCf = concat(op, single(flag(x86flag_cf)));
+ VarList(9) outputWithCf = arithmeticLeftShifter(opWithCf, shiftCount); // Because op is LSB first
+ flag(x86flag_cf) = outputWithCf[8];
+ flag(x86flag_of) = xorGate(outputWithCf[7], outputWithCf[8]);
+ write(operands[0], extract<0, 8>(outputWithCf));
+ setFlagsForResult(extract<0, 8>(outputWithCf));
+ flag(x86flag_af) = FALSE; // Undefined
+ break;
+ }
+ case 2: {
+ VarList(16) op = read<16>(operands[0]);
+ VarList(5) shiftCount = extract<0, 5>(read<8>(operands[1]));
+ VarList(17) opWithCf = concat(op, single(flag(x86flag_cf)));
+ VarList(17) outputWithCf = arithmeticLeftShifter(opWithCf, shiftCount); // Because op is LSB first
+ flag(x86flag_cf) = outputWithCf[16];
+ flag(x86flag_of) = xorGate(outputWithCf[15], outputWithCf[16]);
+ write(operands[0], extract<0, 16>(outputWithCf));
+ setFlagsForResult(extract<0, 16>(outputWithCf));
+ flag(x86flag_af) = FALSE; // Undefined
+ break;
+ }
+ case 4: {
+ VarList(32) op = read<32>(operands[0]);
+ VarList(5) shiftCount = extract<0, 5>(read<8>(operands[1]));
+ VarList(33) opWithCf = concat(op, single(flag(x86flag_cf)));
+ VarList(33) outputWithCf = arithmeticLeftShifter(opWithCf, shiftCount); // Because op is LSB first
+ flag(x86flag_cf) = outputWithCf[32];
+ flag(x86flag_of) = xorGate(outputWithCf[31], outputWithCf[32]);
+ write(operands[0], extract<0, 32>(outputWithCf));
+ setFlagsForResult(extract<0, 32>(outputWithCf));
+ flag(x86flag_af) = FALSE; // Undefined
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size");
+ }
+ break;
+ }
+ case x86_rol: {
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 1: {
+ VarList(8) op = read<8>(operands[0]);
+ VarList(5) shiftCount = extract<0, 5>(read<8>(operands[1]));
+ VarList(8) output = rightRotater(op, shiftCount); // Because op is LSB first
+ flag(x86flag_cf) = mux(norAcross(shiftCount), flag(x86flag_cf), output[0]);
+ flag(x86flag_of) = mux(norAcross(shiftCount), flag(x86flag_of), xorGate(output[0], output[7]));
+ write(operands[0], output);
+ break;
+ }
+ case 2: {
+ VarList(16) op = read<16>(operands[0]);
+ VarList(5) shiftCount = extract<0, 5>(read<8>(operands[1]));
+ VarList(16) output = rightRotater(op, shiftCount); // Because op is LSB first
+ flag(x86flag_cf) = mux(norAcross(shiftCount), flag(x86flag_cf), output[0]);
+ flag(x86flag_of) = mux(norAcross(shiftCount), flag(x86flag_of), xorGate(output[0], output[15]));
+ write(operands[0], output);
+ break;
+ }
+ case 4: {
+ VarList(32) op = read<32>(operands[0]);
+ VarList(5) shiftCount = extract<0, 5>(read<8>(operands[1]));
+ VarList(32) output = rightRotater(op, shiftCount); // Because op is LSB first
+ flag(x86flag_cf) = mux(norAcross(shiftCount), flag(x86flag_cf), output[0]);
+ flag(x86flag_of) = mux(norAcross(shiftCount), flag(x86flag_of), xorGate(output[0], output[31]));
+ write(operands[0], output);
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size");
+ }
+ break;
+ }
+ case x86_ror: {
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 1: {
+ VarList(8) op = read<8>(operands[0]);
+ VarList(5) shiftCount = extract<0, 5>(read<8>(operands[1]));
+ VarList(8) output = leftRotater(op, shiftCount); // Because op is LSB first
+ flag(x86flag_cf) = mux(norAcross(shiftCount), flag(x86flag_cf), output[7]);
+ flag(x86flag_of) = mux(norAcross(shiftCount), flag(x86flag_of), xorGate(output[6], output[7]));
+ write(operands[0], output);
+ break;
+ }
+ case 2: {
+ VarList(16) op = read<16>(operands[0]);
+ VarList(5) shiftCount = extract<0, 5>(read<8>(operands[1]));
+ VarList(16) output = leftRotater(op, shiftCount); // Because op is LSB first
+ flag(x86flag_cf) = mux(norAcross(shiftCount), flag(x86flag_cf), output[15]);
+ flag(x86flag_of) = mux(norAcross(shiftCount), flag(x86flag_of), xorGate(output[14], output[15]));
+ write(operands[0], output);
+ break;
+ }
+ case 4: {
+ VarList(32) op = read<32>(operands[0]);
+ VarList(5) shiftCount = extract<0, 5>(read<8>(operands[1]));
+ VarList(32) output = leftRotater(op, shiftCount); // Because op is LSB first
+ flag(x86flag_cf) = mux(norAcross(shiftCount), flag(x86flag_cf), output[31]);
+ flag(x86flag_of) = mux(norAcross(shiftCount), flag(x86flag_of), xorGate(output[30], output[31]));
+ write(operands[0], output);
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size");
+ }
+ break;
+ }
+ case x86_shld: { // FIXME check this
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 2: {
+ VarList(32) op = concat(read<16>(operands[1]), read<16>(operands[0]));
+ VarList(5) shiftCount = extract<0, 5>(read<8>(operands[2]));
+ VarList(33) opWithCf = concat(op, single(flag(x86flag_cf)));
+ VarList(33) outputWithCf = rightShifter(opWithCf, shiftCount); // Because op is LSB first
+ flag(x86flag_cf) = outputWithCf[32];
+ flag(x86flag_of) = xorGate(outputWithCf[31], outputWithCf[32]);
+ write(operands[0], extract<16, 32>(outputWithCf));
+ setFlagsForResult(extract<16, 32>(outputWithCf));
+ flag(x86flag_af) = FALSE; // Undefined
+ break;
+ }
+ case 4: {
+ VarList(64) op = concat(read<32>(operands[1]), read<32>(operands[0]));
+ VarList(5) shiftCount = extract<0, 5>(read<8>(operands[2]));
+ VarList(65) opWithCf = concat(op, single(flag(x86flag_cf)));
+ VarList(65) outputWithCf = rightShifter(opWithCf, shiftCount); // Because op is LSB first
+ flag(x86flag_cf) = outputWithCf[64];
+ flag(x86flag_of) = xorGate(outputWithCf[63], outputWithCf[64]);
+ write(operands[0], extract<32, 64>(outputWithCf));
+ setFlagsForResult(extract<32, 64>(outputWithCf));
+ flag(x86flag_af) = FALSE; // Undefined
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size");
+ }
+ break;
+ }
+ case x86_shrd: { // FIXME check this
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 2: {
+ VarList(32) op = concat(read<16>(operands[0]), read<16>(operands[1]));
+ VarList(5) shiftCount = extract<0, 5>(read<8>(operands[2]));
+ VarList(33) opWithCf = concat(op, single(flag(x86flag_cf)));
+ VarList(33) outputWithCf = leftShifter(opWithCf, shiftCount); // Because op is LSB first
+ flag(x86flag_cf) = outputWithCf[16];
+ flag(x86flag_of) = xorGate(outputWithCf[15], outputWithCf[16]);
+ write(operands[0], extract<0, 16>(outputWithCf));
+ setFlagsForResult(extract<0, 16>(outputWithCf));
+ flag(x86flag_af) = FALSE; // Undefined
+ break;
+ }
+ case 4: {
+ VarList(64) op = concat(read<32>(operands[0]), read<32>(operands[1]));
+ VarList(5) shiftCount = extract<0, 5>(read<8>(operands[2]));
+ VarList(65) opWithCf = concat(op, single(flag(x86flag_cf)));
+ VarList(65) outputWithCf = leftShifter(opWithCf, shiftCount); // Because op is LSB first
+ flag(x86flag_cf) = outputWithCf[32];
+ flag(x86flag_of) = xorGate(outputWithCf[31], outputWithCf[32]);
+ write(operands[0], extract<0, 32>(outputWithCf));
+ setFlagsForResult(extract<0, 32>(outputWithCf));
+ flag(x86flag_af) = FALSE; // Undefined
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size");
+ }
+ break;
+ }
+ case x86_bsf: {
+ flag(x86flag_of) = FALSE; // Undefined
+ flag(x86flag_sf) = FALSE; // Undefined
+ flag(x86flag_af) = FALSE; // Undefined
+ flag(x86flag_pf) = FALSE; // Undefined
+ flag(x86flag_cf) = FALSE; // Undefined
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 2: {
+ VarList(16) op = read<16>(operands[1]);
+ flag(x86flag_zf) = norAcross(op);
+ VarList(16) result = ite(flag(x86flag_zf),
+ read<16>(operands[0]),
+ leastSignificantSetBit(op));
+ write(operands[0], result);
+ break;
+ }
+ case 4: {
+ VarList(32) op = read<32>(operands[1]);
+ flag(x86flag_zf) = norAcross(op);
+ VarList(32) result = ite(flag(x86flag_zf),
+ read<32>(operands[0]),
+ leastSignificantSetBit(op));
+ write(operands[0], result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size");
+ }
+ break;
+ }
+ case x86_bsr: {
+ flag(x86flag_of) = FALSE; // Undefined
+ flag(x86flag_sf) = FALSE; // Undefined
+ flag(x86flag_af) = FALSE; // Undefined
+ flag(x86flag_pf) = FALSE; // Undefined
+ flag(x86flag_cf) = FALSE; // Undefined
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 2: {
+ VarList(16) op = read<16>(operands[1]);
+ flag(x86flag_zf) = norAcross(op);
+ VarList(16) result = ite(flag(x86flag_zf),
+ read<16>(operands[0]),
+ xorWords(number<16>(15),
+ leastSignificantSetBit(bitReverse(op))));
+ write(operands[0], result);
+ break;
+ }
+ case 4: {
+ VarList(32) op = read<32>(operands[1]);
+ flag(x86flag_zf) = norAcross(op);
+ VarList(32) result = ite(flag(x86flag_zf),
+ read<32>(operands[0]),
+ xorWords(number<32>(31),
+ leastSignificantSetBit(bitReverse(op))));
+ write(operands[0], result);
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size");
+ }
+ break;
+ }
+ case x86_imul: {
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 1: {
+ VarList(8) op0 = extract<0, 8>(vars(gpr(x86_gpr_ax)));
+ VarList(8) op1 = read<8>(operands[0]);
+ VarList(16) mulResult = signedMultiplier(op0, op1);
+ vars(gpr(x86_gpr_ax)) = concat(mulResult, extract<16, 32>(vars(gpr(x86_gpr_ax))));
+ Var carry = norGate(andAcross(extract<7, 16>(mulResult)), norAcross(extract<7, 16>(mulResult)));
+ flag(x86flag_cf) = flag(x86flag_of) = carry;
+ break;
+ }
+ case 2: {
+ VarList(16) op0 = operands.size() == 1 ? extract<0, 16>(vars(gpr(x86_gpr_ax))) : read<16>(operands[operands.size() - 2]);
+ VarList(16) op1 = read<16>(operands[operands.size() - 1]);
+ VarList(32) mulResult = signedMultiplier(op0, op1);
+ if (operands.size() == 1) {
+ vars(gpr(x86_gpr_ax)) = concat(extract<0, 16>(mulResult), extract<16, 32>(vars(gpr(x86_gpr_ax))));
+ vars(gpr(x86_gpr_dx)) = concat(extract<16, 32>(mulResult), extract<16, 32>(vars(gpr(x86_gpr_dx))));
+ } else {
+ write(operands[0], extract<0, 16>(mulResult));
+ }
+ Var carry = norGate(andAcross(extract<7, 32>(mulResult)), norAcross(extract<7, 32>(mulResult)));
+ flag(x86flag_cf) = flag(x86flag_of) = carry;
+ break;
+ }
+ case 4: {
+ VarList(32) op0 = operands.size() == 1 ? vars(gpr(x86_gpr_ax)) : read<32>(operands[operands.size() - 2]);
+ VarList(32) op1 = read<32>(operands[operands.size() - 1]);
+ VarList(64) mulResult = signedMultiplier(op0, op1);
+ if (operands.size() == 1) {
+ vars(gpr(x86_gpr_ax)) = extract<0, 32>(mulResult);
+ vars(gpr(x86_gpr_dx)) = extract<32, 64>(mulResult);
+ } else {
+ write(operands[0], extract<0, 32>(mulResult));
+ }
+ Var carry = norGate(andAcross(extract<7, 64>(mulResult)), norAcross(extract<7, 64>(mulResult)));
+ flag(x86flag_cf) = flag(x86flag_of) = carry;
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size");
+ }
+ flag(x86flag_sf) = FALSE; // Undefined
+ flag(x86flag_zf) = FALSE; // Undefined
+ flag(x86flag_af) = FALSE; // Undefined
+ flag(x86flag_pf) = FALSE; // Undefined
+ break;
+ }
+ case x86_mul: {
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 1: {
+ VarList(8) op0 = extract<0, 8>(vars(gpr(x86_gpr_ax)));
+ VarList(8) op1 = read<8>(operands[0]);
+ VarList(16) mulResult = unsignedMultiplier(op0, op1);
+ vars(gpr(x86_gpr_ax)) = concat(mulResult, extract<16, 32>(vars(gpr(x86_gpr_ax))));
+ Var carry = orAcross(extract<8, 16>(mulResult));
+ flag(x86flag_cf) = flag(x86flag_of) = carry;
+ break;
+ }
+ case 2: {
+ VarList(16) op0 = extract<0, 16>(vars(gpr(x86_gpr_ax)));
+ VarList(16) op1 = read<16>(operands[0]);
+ VarList(32) mulResult = unsignedMultiplier(op0, op1);
+ vars(gpr(x86_gpr_ax)) = concat(extract<0, 16>(mulResult), extract<16, 32>(vars(gpr(x86_gpr_ax))));
+ vars(gpr(x86_gpr_dx)) = concat(extract<16, 32>(mulResult), extract<16, 32>(vars(gpr(x86_gpr_dx))));
+ Var carry = orAcross(extract<16, 32>(mulResult));
+ flag(x86flag_cf) = flag(x86flag_of) = carry;
+ break;
+ }
+ case 4: {
+ VarList(32) op0 = vars(gpr(x86_gpr_ax));
+ VarList(32) op1 = read<32>(operands[0]);
+ VarList(64) mulResult = unsignedMultiplier(op0, op1);
+ vars(gpr(x86_gpr_ax)) = extract<0, 32>(mulResult);
+ vars(gpr(x86_gpr_dx)) = extract<32, 64>(mulResult);
+ Var carry = orAcross(extract<32, 64>(mulResult));
+ flag(x86flag_cf) = flag(x86flag_of) = carry;
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size");
+ }
+ flag(x86flag_sf) = FALSE; // Undefined
+ flag(x86flag_zf) = FALSE; // Undefined
+ flag(x86flag_af) = FALSE; // Undefined
+ flag(x86flag_pf) = FALSE; // Undefined
+ break;
+ }
+ case x86_idiv: {
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 1: {
+ VarList(16) op0 = extract<0, 16>(vars(gpr(x86_gpr_ax)));
+ VarList(8) op1 = read<8>(operands[0]);
+ // if op1 == 0, we should trap
+ VarList(24) divResult = signedDivider(op0, op1); // 16 bits quotient, 8 remainder
+ // if result overflows, we should trap
+ vars(gpr(x86_gpr_ax)) = concat(concat(extract<0, 8>(divResult), extract<16, 24>(divResult)), extract<16, 32>(vars(gpr(x86_gpr_ax))));
+ break;
+ }
+ case 2: {
+ VarList(32) op0 = concat(extract<0, 16>(vars(gpr(x86_gpr_ax))), extract<0, 16>(vars(gpr(x86_gpr_dx))));
+ VarList(16) op1 = read<16>(operands[0]);
+ // if op1 == 0, we should trap
+ VarList(48) divResult = signedDivider(op0, op1); // 32 bits quotient, 16 remainder
+ // if result overflows, we should trap
+ vars(gpr(x86_gpr_ax)) = concat(extract<0, 16>(divResult), extract<16, 32>(vars(gpr(x86_gpr_ax))));
+ vars(gpr(x86_gpr_dx)) = concat(extract<32, 48>(divResult), extract<16, 32>(vars(gpr(x86_gpr_dx))));
+ break;
+ }
+ case 4: {
+ VarList(64) op0 = concat(vars(gpr(x86_gpr_ax)), vars(gpr(x86_gpr_dx)));
+ VarList(32) op1 = read<32>(operands[0]);
+ // if op1 == 0, we should trap
+ VarList(96) divResult = signedDivider(op0, op1); // 64 bits quotient, 32 remainder
+ // if result overflows, we should trap
+ vars(gpr(x86_gpr_ax)) = extract<0, 32>(divResult);
+ vars(gpr(x86_gpr_dx)) = extract<64, 96>(divResult);
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size");
+ }
+ flag(x86flag_sf) = FALSE; // Undefined
+ flag(x86flag_zf) = FALSE; // Undefined
+ flag(x86flag_af) = FALSE; // Undefined
+ flag(x86flag_pf) = FALSE; // Undefined
+ flag(x86flag_cf) = FALSE; // Undefined
+ flag(x86flag_of) = FALSE; // Undefined
+ break;
+ }
+ case x86_div: {
+ switch (numBytesInAsmType(operands[0]->get_type())) {
+ case 1: {
+ VarList(16) op0 = extract<0, 16>(vars(gpr(x86_gpr_ax)));
+ VarList(8) op1 = read<8>(operands[0]);
+ // if op1 == 0, we should trap
+ VarList(24) divResult = unsignedDivider(op0, op1); // 16 bits quotient, 8 remainder
+ // if extract<8, 16> of divResult is non-zero (overflow), we should trap
+ vars(gpr(x86_gpr_ax)) = concat(concat(extract<0, 8>(divResult), extract<16, 24>(divResult)), extract<16, 32>(vars(gpr(x86_gpr_ax))));
+ break;
+ }
+ case 2: {
+ VarList(32) op0 = concat(extract<0, 16>(vars(gpr(x86_gpr_ax))), extract<0, 16>(vars(gpr(x86_gpr_dx))));
+ VarList(16) op1 = read<16>(operands[0]);
+ // if op1 == 0, we should trap
+ VarList(48) divResult = unsignedDivider(op0, op1); // 32 bits quotient, 16 remainder
+ // if extract<16, 32> of divResult is non-zero (overflow), we should trap
+ vars(gpr(x86_gpr_ax)) = concat(extract<0, 16>(divResult), extract<16, 32>(vars(gpr(x86_gpr_ax))));
+ vars(gpr(x86_gpr_dx)) = concat(extract<32, 48>(divResult), extract<16, 32>(vars(gpr(x86_gpr_dx))));
+ break;
+ }
+ case 4: {
+ VarList(64) op0 = concat(vars(gpr(x86_gpr_ax)), vars(gpr(x86_gpr_dx)));
+ VarList(32) op1 = read<32>(operands[0]);
+ // if op1 == 0, we should trap
+ VarList(96) divResult = unsignedDivider(op0, op1); // 64 bits quotient, 32 remainder
+ // if extract<32, 64> of divResult is non-zero (overflow), we should trap
+ vars(gpr(x86_gpr_ax)) = extract<0, 32>(divResult);
+ vars(gpr(x86_gpr_dx)) = extract<64, 96>(divResult);
+ break;
+ }
+ default: ROSE_ASSERT (!"Bad size");
+ }
+ flag(x86flag_sf) = FALSE; // Undefined
+ flag(x86flag_zf) = FALSE; // Undefined
+ flag(x86flag_af) = FALSE; // Undefined
+ flag(x86flag_pf) = FALSE; // Undefined
+ flag(x86flag_cf) = FALSE; // Undefined
+ flag(x86flag_of) = FALSE; // Undefined
+ break;
+ }
+ case x86_push: {
+ ROSE_ASSERT (operands.size() == 1);
+ ROSE_ASSERT (insn->get_addressSize() == x86_insnsize_32);
+ ROSE_ASSERT (insn->get_operandSize() == x86_insnsize_32);
+ VarList(32) oldSp = vars(gpr(x86_gpr_sp));
+ VarList(32) newSp = adder(oldSp, number<32>(-4));
+ writeMemory<32>(newSp, read<32>(operands[0]));
+ vars(gpr(x86_gpr_sp)) = newSp;
+ break;
+ }
+ case x86_pop: {
+ ROSE_ASSERT (operands.size() == 1);
+ ROSE_ASSERT (insn->get_addressSize() == x86_insnsize_32);
+ ROSE_ASSERT (insn->get_operandSize() == x86_insnsize_32);
+ VarList(32) oldSp = vars(gpr(x86_gpr_sp));
+ VarList(32) newSp = adder(oldSp, number<32>(4));
+ write<32>(operands[0], readMemory<32>(oldSp));
+ vars(gpr(x86_gpr_sp)) = newSp;
+ break;
+ }
+ case x86_call: {
+ ROSE_ASSERT (operands.size() == 1);
+ ROSE_ASSERT (insn->get_addressSize() == x86_insnsize_32);
+ ROSE_ASSERT (insn->get_operandSize() == x86_insnsize_32);
+ VarList(32) oldSp = vars(gpr(x86_gpr_sp));
+ VarList(32) newSp = adder(oldSp, number<32>(-4));
+ writeMemory<32>(newSp, vars(ip()));
+ vars(ip()) = read<32>(operands[0]);
+ vars(gpr(x86_gpr_sp)) = newSp;
+ break;
+ }
+ case x86_ret: {
+ ROSE_ASSERT (operands.size() == 0);
+ ROSE_ASSERT (insn->get_addressSize() == x86_insnsize_32);
+ ROSE_ASSERT (insn->get_operandSize() == x86_insnsize_32);
+ VarList(32) oldSp = vars(gpr(x86_gpr_sp));
+ VarList(32) newSp = adder(oldSp, number<32>(4));
+ vars(ip()) = readMemory<32>(oldSp);
+ vars(gpr(x86_gpr_sp)) = newSp;
+ break;
+ }
+ case x86_jmp: {
+ ROSE_ASSERT (operands.size() == 1);
+ vars(ip()) = read<32>(operands[0]);
+ break;
+ }
+#define FLAGCOMBO_ne invert(flag(x86flag_zf))
+#define FLAGCOMBO_e flag(x86flag_zf)
+#define FLAGCOMBO_ns invert(flag(x86flag_sf))
+#define FLAGCOMBO_s flag(x86flag_sf)
+#define FLAGCOMBO_ae invert(flag(x86flag_cf))
+#define FLAGCOMBO_b flag(x86flag_cf)
+#define FLAGCOMBO_be orGate(FLAGCOMBO_b, FLAGCOMBO_e)
+#define FLAGCOMBO_a andGate(FLAGCOMBO_ae, FLAGCOMBO_ne)
+#define FLAGCOMBO_l xorGate(flag(x86flag_sf), flag(x86flag_of))
+#define FLAGCOMBO_ge invert(xorGate(flag(x86flag_sf), flag(x86flag_of)))
+#define FLAGCOMBO_le orGate(FLAGCOMBO_e, FLAGCOMBO_l)
+#define FLAGCOMBO_g andGate(FLAGCOMBO_ge, FLAGCOMBO_ne)
+#define FLAGCOMBO_cxz norAcross(extract<0, 16>(vars(gpr(x86_gpr_cx))))
+#define FLAGCOMBO_ecxz norAcross(vars(gpr(x86_gpr_cx)))
+#define JUMP(tag) case x86_j##tag: {ROSE_ASSERT(operands.size() == 1); vars(ip()) = ite(FLAGCOMBO_##tag, read<32>(operands[0]), vars(ip())); break;}
+ JUMP(ne)
+ JUMP(e)
+ JUMP(ns)
+ JUMP(s)
+ JUMP(ae)
+ JUMP(b)
+ JUMP(be)
+ JUMP(a)
+ JUMP(le)
+ JUMP(g)
+ JUMP(ge)
+ JUMP(l)
+ JUMP(cxz)
+ JUMP(ecxz)
+#undef JUMP
+#define SET(tag) case x86_set##tag: {ROSE_ASSERT (operands.size() == 1); write<8>(operands[0], concat(single(FLAGCOMBO_##tag), number<7>(0))); break;}
+ SET(ne)
+ SET(e)
+ SET(ns)
+ SET(s)
+ SET(ae)
+ SET(b)
+ SET(be)
+ SET(a)
+ SET(le)
+ SET(g)
+ SET(ge)
+ SET(l)
+#undef SET
+ case x86_cld: {
+ ROSE_ASSERT (operands.size() == 0);
+ flag(x86flag_df) = FALSE;
+ break;
+ }
+ case x86_std: {
+ ROSE_ASSERT (operands.size() == 0);
+ flag(x86flag_df) = TRUE;
+ break;
+ }
+ case x86_nop: break;
+ case x86_repne_scasb: break; // FIXME
+ case x86_repe_cmpsb: break; // FIXME
+ case x86_lodsd: {
+ vars(gpr(x86_gpr_ax)) = readMemory<32>(vars(gpr(x86_gpr_si)));
+ vars(gpr(x86_gpr_si)) = adder(vars(gpr(x86_gpr_si)), ite(flag(x86flag_df), number<32>(-4), number<32>(4)));
+ break;
+ }
+ case x86_lodsw: {
+ vars(gpr(x86_gpr_ax)) = concat(readMemory<16>(vars(gpr(x86_gpr_si))), extract<16, 32>(vars(gpr(x86_gpr_ax))));
+ vars(gpr(x86_gpr_si)) = adder(vars(gpr(x86_gpr_si)), ite(flag(x86flag_df), number<32>(-2), number<32>(2)));
+ break;
+ }
+ case x86_lodsb: {
+ vars(gpr(x86_gpr_ax)) = concat(readMemory<8>(vars(gpr(x86_gpr_si))), extract<8, 32>(vars(gpr(x86_gpr_ax))));
+ vars(gpr(x86_gpr_si)) = adder(vars(gpr(x86_gpr_si)), ite(flag(x86flag_df), number<32>(-1), number<32>(1)));
+ break;
+ }
+ case x86_hlt: break; // FIXME
+ case x86_int: break; // FIXME
+ default: fprintf(stderr, "Bad instruction %s\n", toString(kind).c_str()); abort();
+ }
+ }
+
+ RegMap writeBack() const { // FIXME
+ return registerMap;
+ }
+
+ static void processBlock(SgAsmBlock* b) {
+ const SgAsmStatementPtrList& stmts = b->get_statementList();
+ if (stmts.empty()) return;
+ if (!isSgAsmInstruction(stmts[0])) return; // A block containing functions or something
+ fprintf(stderr, "Block 0x%08X contains %zu instruction(s)\n", (unsigned int)(b->get_address()), stmts.size());
+ NetlistTranslator t;
+ for (size_t i = 0; i < stmts.size(); ++i) {
+ SgAsmx86Instruction* insn = isSgAsmx86Instruction(stmts[i]);
+ ROSE_ASSERT (insn);
+ t.translate(insn);
+ }
+ t.writeBack();
+ }
+
+};
+
+int main(int argc, char** argv) {
+ SgProject* proj = frontend(argc, argv);
+ fprintf(stdout, "(");
+ vector<SgNode*> blocks = NodeQuery::querySubTree(proj, V_SgAsmBlock);
+ for (size_t i = 0; i < blocks.size(); ++i) {
+ SgAsmBlock* b = isSgAsmBlock(blocks[i]);
+ ROSE_ASSERT (b);
+ NetlistTranslator::processBlock(b);
+ }
+ fprintf(stdout, ")");
+ return 0;
+}
Modified: trunk/projects/binCompass/Makefile.in
===================================================================
--- trunk/projects/binCompass/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/binCompass/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -132,7 +132,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -140,9 +141,10 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
binCompassMain_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_1)
+ $(am__DEPENDENCIES_7) $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -198,7 +200,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -249,8 +250,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -268,8 +267,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -280,8 +277,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -310,13 +305,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -361,6 +352,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -384,8 +377,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -432,8 +423,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -475,14 +464,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -494,32 +483,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -585,6 +575,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -630,10 +621,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/binCompass/analyses/Makefile.in
===================================================================
--- trunk/projects/binCompass/analyses/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/binCompass/analyses/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -186,7 +186,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -237,8 +236,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -256,8 +253,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = -module
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -268,8 +263,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -298,13 +291,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -349,6 +338,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -372,8 +363,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -420,8 +409,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -463,14 +450,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -482,32 +469,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -573,6 +561,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -618,10 +607,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/binCompass/graphanalyses/Makefile.in
===================================================================
--- trunk/projects/binCompass/graphanalyses/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/binCompass/graphanalyses/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -190,7 +190,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -241,8 +240,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -260,8 +257,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = -module
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -272,8 +267,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -302,13 +295,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -353,6 +342,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -376,8 +367,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -424,8 +413,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -467,14 +454,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -486,32 +473,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -577,6 +565,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -622,10 +611,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/binaryVisualization/Makefile.in
===================================================================
--- trunk/projects/binaryVisualization/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/binaryVisualization/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -133,7 +133,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -141,9 +142,10 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
@ROSE_USE_OPENGL_TRUE at vizzBinary_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- at ROSE_USE_OPENGL_TRUE@ $(am__DEPENDENCIES_6) \
+ at ROSE_USE_OPENGL_TRUE@ $(am__DEPENDENCIES_7) \
@ROSE_USE_OPENGL_TRUE@ $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
@@ -193,7 +195,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -244,8 +245,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -263,8 +262,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -275,8 +272,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -305,13 +300,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -356,6 +347,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -379,8 +372,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -427,8 +418,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -470,14 +459,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -489,32 +478,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -580,6 +570,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -625,10 +616,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/bugSeeding/Makefile.in
===================================================================
--- trunk/projects/bugSeeding/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/bugSeeding/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -135,7 +135,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -143,8 +144,9 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-bugSeeding_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+bugSeeding_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -193,7 +195,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -244,8 +245,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -263,8 +262,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -275,8 +272,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -305,13 +300,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -356,6 +347,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -379,8 +372,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -427,8 +418,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -470,14 +459,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -489,32 +478,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -580,6 +570,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -625,10 +616,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/checkPointExample/Makefile.in
===================================================================
--- trunk/projects/checkPointExample/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/checkPointExample/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/compass/Makefile.in
===================================================================
--- trunk/projects/compass/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/compass/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -161,7 +161,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -212,8 +211,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -231,8 +228,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -243,8 +238,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -273,13 +266,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -324,6 +313,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -347,8 +338,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -395,8 +384,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -438,14 +425,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -457,32 +444,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -548,6 +536,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -593,10 +582,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/compass/src/Makefile.in
===================================================================
--- trunk/projects/compass/src/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/compass/src/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -161,7 +161,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -212,8 +211,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -231,8 +228,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -243,8 +238,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -273,13 +266,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -324,6 +313,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -347,8 +338,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -395,8 +384,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -438,14 +425,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -457,32 +444,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -548,6 +536,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -593,10 +582,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/compass/src/compassSupport/Makefile.in
===================================================================
--- trunk/projects/compass/src/compassSupport/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/compass/src/compassSupport/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -97,7 +97,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -114,6 +113,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -149,7 +149,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -157,9 +158,10 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
-compassEmptyMain_DEPENDENCIES = $(am__DEPENDENCIES_7) libCompass.la
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+compassEmptyMain_DEPENDENCIES = $(am__DEPENDENCIES_8) libCompass.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -211,7 +213,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@ $(am__append_2)
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -262,8 +263,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -281,8 +280,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -293,8 +290,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -323,13 +318,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -374,6 +365,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -397,8 +390,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -445,8 +436,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -488,14 +477,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -507,32 +496,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -598,6 +588,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -643,10 +634,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/compass/src/util/C-API/Makefile.in
===================================================================
--- trunk/projects/compass/src/util/C-API/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/compass/src/util/C-API/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -94,7 +94,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -111,6 +110,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -140,7 +140,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -148,8 +149,9 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-testC_API_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+testC_API_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7) \
../../compassSupport/libCompass.la libC-API.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
@@ -206,7 +208,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -257,8 +258,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -276,8 +275,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -288,8 +285,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -318,13 +313,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -369,6 +360,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -392,8 +385,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -440,8 +431,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -483,14 +472,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -502,32 +491,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -593,6 +583,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -638,10 +629,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/compass/src/util/MPIAbstraction/Makefile.in
===================================================================
--- trunk/projects/compass/src/util/MPIAbstraction/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/compass/src/util/MPIAbstraction/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -94,7 +94,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -111,6 +110,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -137,7 +137,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -145,10 +146,11 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
testMPIAbstraction_DEPENDENCIES = libMPIAbstraction.la \
../C-API/libC-API.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -213,7 +215,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -264,8 +265,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -283,8 +282,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -295,8 +292,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -325,13 +320,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -376,6 +367,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -399,8 +392,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -447,8 +438,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -491,14 +480,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -510,32 +499,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -601,6 +591,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -646,10 +637,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/Makefile.in
===================================================================
--- trunk/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -177,7 +177,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -228,8 +227,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -247,8 +244,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -259,8 +254,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -289,13 +282,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -340,6 +329,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -363,8 +354,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -411,8 +400,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -455,14 +442,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -474,32 +461,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -565,6 +553,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -610,10 +599,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/Makefile.in
===================================================================
--- trunk/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -62,7 +62,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -79,6 +78,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -134,7 +134,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -185,8 +184,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -204,8 +201,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -216,8 +211,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -246,13 +239,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -297,6 +286,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -320,8 +311,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -368,8 +357,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/include/Makefile.in
===================================================================
--- trunk/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/include/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/include/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -62,7 +62,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -79,6 +78,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -134,7 +134,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -185,8 +184,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -204,8 +201,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -216,8 +211,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -246,13 +239,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -297,6 +286,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -320,8 +311,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -368,8 +357,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/include/mpi2c++/Makefile.in
===================================================================
--- trunk/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/include/mpi2c++/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/compass/src/util/MPIAbstraction/alt-mpi-headers/mpich-1.2.7p1/include/mpi2c++/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -62,7 +62,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -79,6 +78,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -125,7 +125,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -176,8 +175,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -195,8 +192,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -207,8 +202,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -237,13 +230,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -288,6 +277,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -311,8 +302,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -359,8 +348,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/projects/compass/src/util/Makefile.in
===================================================================
--- trunk/projects/compass/src/util/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/compass/src/util/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -64,7 +64,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -81,6 +80,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -136,7 +136,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -187,8 +186,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -206,8 +203,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -218,8 +213,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -248,13 +241,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -299,6 +288,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -322,8 +313,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -370,8 +359,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/projects/compass/tools/Makefile.in
===================================================================
--- trunk/projects/compass/tools/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/compass/tools/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -161,7 +161,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -212,8 +211,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -231,8 +228,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -243,8 +238,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -273,13 +266,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -324,6 +313,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -347,8 +338,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -395,8 +384,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -438,14 +425,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -457,32 +444,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -548,6 +536,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -593,10 +582,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/compass/tools/compass/Makefile.in
===================================================================
--- trunk/projects/compass/tools/compass/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/compass/tools/compass/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -95,7 +95,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -112,6 +111,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -139,7 +139,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -147,9 +148,10 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
libCompassCheckers_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6) $(compass_support_bdir)/libCompass.la
+ $(am__DEPENDENCIES_7) $(compass_support_bdir)/libCompass.la
am_libCompassCheckers_la_OBJECTS = buildCheckers.lo
libCompassCheckers_la_OBJECTS = $(am_libCompassCheckers_la_OBJECTS)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@@ -218,7 +220,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -269,8 +270,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -288,8 +287,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -300,8 +297,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -330,13 +325,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -381,6 +372,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -404,8 +397,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -452,8 +443,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -495,14 +484,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -514,32 +503,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -605,6 +595,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -650,10 +641,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/compass/tools/compass/doc/Makefile.in
===================================================================
--- trunk/projects/compass/tools/compass/doc/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/compass/tools/compass/doc/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -154,7 +154,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -205,8 +204,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -224,8 +221,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -236,8 +231,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -266,13 +259,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -317,6 +306,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -340,8 +331,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -388,8 +377,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -431,14 +418,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -450,32 +437,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -541,6 +529,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -586,10 +575,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/compass/tools/compass/gui/Makefile.am
===================================================================
--- trunk/projects/compass/tools/compass/gui/Makefile.am 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/compass/tools/compass/gui/Makefile.am 2008-09-12 20:14:11 UTC (rev 32)
@@ -1,7 +1,7 @@
include $(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
include $(top_srcdir)/projects/compass/src/compassSupport/compass_dirs.inc
-if USE_QROSE
+if ROSE_USE_QROSE
$(compass_build_tooldir)/compass/libCompassCheckers.la:
cd .. && $(MAKE) libCompassCheckers.la
@@ -19,7 +19,8 @@
compassMainGui_LDADD = -L$(compass_build_tooldir)/compass -lCompassCheckers $(ROSE_LIBS) $(QT_LDFLAGS) $(QROSE_LDFLAGS) -lrt
-INCLUDES = $(ROSE_INCLUDES) $(QT_INCLUDES) $(QROSE_CXXFLAGS) $(BOOST_CPPFLAGS) -I$(compass_support_dir) -I$(compass_srcdir) -I$(compass_checker_dir) -I$(compass_prereqs_dir) -I$(compass_support_bdir) -I.
+# INCLUDES = $(ROSE_INCLUDES) $(QT_INCLUDES) $(QROSE_CXXFLAGS) $(BOOST_CPPFLAGS) -I$(compass_support_dir) -I$(compass_srcdir) -I$(compass_checker_dir) -I$(compass_prereqs_dir) -I$(compass_support_bdir) -I.
+INCLUDES = $(ROSE_INCLUDES) $(BOOST_CPPFLAGS) -I$(compass_support_dir) -I$(compass_srcdir) -I$(compass_checker_dir) -I$(compass_prereqs_dir) -I$(compass_support_bdir) -I.
compassMainGui_DEPENDENCIES = $(compass_build_tooldir)/compass/libCompassCheckers.la
Modified: trunk/projects/compass/tools/compass/gui/Makefile.in
===================================================================
--- trunk/projects/compass/tools/compass/gui/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/compass/tools/compass/gui/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -65,7 +65,7 @@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs \
$(top_srcdir)/projects/compass/src/compassSupport/compass_dirs.inc
- at USE_QROSE_TRUE@bin_PROGRAMS = compassMainGui$(EXEEXT)
+ at ROSE_USE_QROSE_TRUE@bin_PROGRAMS = compassMainGui$(EXEEXT)
subdir = projects/compass/tools/compass/gui
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = \
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -123,12 +123,13 @@
am__compassMainGui_SOURCES_DIST = timer.C compassGui.C compassResult.C \
compassViolation.C compassChecker.C compassInterface.C \
compassMainGui.C
- at USE_QROSE_TRUE@am_compassMainGui_OBJECTS = timer.$(OBJEXT) \
- at USE_QROSE_TRUE@ compassGui.$(OBJEXT) compassResult.$(OBJEXT) \
- at USE_QROSE_TRUE@ compassViolation.$(OBJEXT) \
- at USE_QROSE_TRUE@ compassChecker.$(OBJEXT) \
- at USE_QROSE_TRUE@ compassInterface.$(OBJEXT) \
- at USE_QROSE_TRUE@ compassMainGui.$(OBJEXT)
+ at ROSE_USE_QROSE_TRUE@am_compassMainGui_OBJECTS = timer.$(OBJEXT) \
+ at ROSE_USE_QROSE_TRUE@ compassGui.$(OBJEXT) \
+ at ROSE_USE_QROSE_TRUE@ compassResult.$(OBJEXT) \
+ at ROSE_USE_QROSE_TRUE@ compassViolation.$(OBJEXT) \
+ at ROSE_USE_QROSE_TRUE@ compassChecker.$(OBJEXT) \
+ at ROSE_USE_QROSE_TRUE@ compassInterface.$(OBJEXT) \
+ at ROSE_USE_QROSE_TRUE@ compassMainGui.$(OBJEXT)
compassMainGui_OBJECTS = $(am_compassMainGui_OBJECTS)
am__DEPENDENCIES_1 =
@ROSE_USE_MYSQL_DATABASE_TRUE at am__DEPENDENCIES_2 = \
@@ -140,7 +141,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -148,7 +150,8 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -197,7 +200,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -248,8 +250,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -267,8 +267,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -279,8 +277,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -309,13 +305,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -360,6 +352,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -383,8 +377,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -431,8 +423,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -474,14 +464,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -493,32 +483,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -584,6 +575,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -629,10 +621,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
@@ -657,29 +651,31 @@
compass_test_dir = $(compass_srcdir)/tests
compass_checker_bdir = $(compass_build_extdir)/checkers
compass_support_bdir = $(compass_build_srcdir)/compassSupport
- at USE_QROSE_TRUE@compassMainGui_SOURCES = \
- at USE_QROSE_TRUE@ timer.C \
- at USE_QROSE_TRUE@ compassGui.C \
- at USE_QROSE_TRUE@ compassResult.C \
- at USE_QROSE_TRUE@ compassViolation.C \
- at USE_QROSE_TRUE@ compassChecker.C \
- at USE_QROSE_TRUE@ compassInterface.C \
- at USE_QROSE_TRUE@ compassMainGui.C
+ at ROSE_USE_QROSE_TRUE@compassMainGui_SOURCES = \
+ at ROSE_USE_QROSE_TRUE@ timer.C \
+ at ROSE_USE_QROSE_TRUE@ compassGui.C \
+ at ROSE_USE_QROSE_TRUE@ compassResult.C \
+ at ROSE_USE_QROSE_TRUE@ compassViolation.C \
+ at ROSE_USE_QROSE_TRUE@ compassChecker.C \
+ at ROSE_USE_QROSE_TRUE@ compassInterface.C \
+ at ROSE_USE_QROSE_TRUE@ compassMainGui.C
- at USE_QROSE_TRUE@compassMainGui_LDADD = -L$(compass_build_tooldir)/compass -lCompassCheckers $(ROSE_LIBS) $(QT_LDFLAGS) $(QROSE_LDFLAGS) -lrt
- at USE_QROSE_TRUE@INCLUDES = $(ROSE_INCLUDES) $(QT_INCLUDES) $(QROSE_CXXFLAGS) $(BOOST_CPPFLAGS) -I$(compass_support_dir) -I$(compass_srcdir) -I$(compass_checker_dir) -I$(compass_prereqs_dir) -I$(compass_support_bdir) -I.
- at USE_QROSE_TRUE@compassMainGui_DEPENDENCIES = $(compass_build_tooldir)/compass/libCompassCheckers.la
- at USE_QROSE_TRUE@CLEANFILES = compass_parameters
- at USE_QROSE_TRUE@EXTRA_DIST = \
- at USE_QROSE_TRUE@ compassChecker.h \
- at USE_QROSE_TRUE@ compassGui.h \
- at USE_QROSE_TRUE@ compassInterface.h \
- at USE_QROSE_TRUE@ compassResult.h \
- at USE_QROSE_TRUE@ compassViolation.h \
- at USE_QROSE_TRUE@ icons.h \
- at USE_QROSE_TRUE@ timer.h \
- at USE_QROSE_TRUE@ disks.xpm
+ at ROSE_USE_QROSE_TRUE@compassMainGui_LDADD = -L$(compass_build_tooldir)/compass -lCompassCheckers $(ROSE_LIBS) $(QT_LDFLAGS) $(QROSE_LDFLAGS) -lrt
+# INCLUDES = $(ROSE_INCLUDES) $(QT_INCLUDES) $(QROSE_CXXFLAGS) $(BOOST_CPPFLAGS) -I$(compass_support_dir) -I$(compass_srcdir) -I$(compass_checker_dir) -I$(compass_prereqs_dir) -I$(compass_support_bdir) -I.
+ at ROSE_USE_QROSE_TRUE@INCLUDES = $(ROSE_INCLUDES) $(BOOST_CPPFLAGS) -I$(compass_support_dir) -I$(compass_srcdir) -I$(compass_checker_dir) -I$(compass_prereqs_dir) -I$(compass_support_bdir) -I.
+ at ROSE_USE_QROSE_TRUE@compassMainGui_DEPENDENCIES = $(compass_build_tooldir)/compass/libCompassCheckers.la
+ at ROSE_USE_QROSE_TRUE@CLEANFILES = compass_parameters
+ at ROSE_USE_QROSE_TRUE@EXTRA_DIST = \
+ at ROSE_USE_QROSE_TRUE@ compassChecker.h \
+ at ROSE_USE_QROSE_TRUE@ compassGui.h \
+ at ROSE_USE_QROSE_TRUE@ compassInterface.h \
+ at ROSE_USE_QROSE_TRUE@ compassResult.h \
+ at ROSE_USE_QROSE_TRUE@ compassViolation.h \
+ at ROSE_USE_QROSE_TRUE@ icons.h \
+ at ROSE_USE_QROSE_TRUE@ timer.h \
+ at ROSE_USE_QROSE_TRUE@ disks.xpm
+
all: all-am
.SUFFIXES:
@@ -846,7 +842,7 @@
|| exit 1; \
fi; \
done
- at USE_QROSE_FALSE@check-local:
+ at ROSE_USE_QROSE_FALSE@check-local:
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-local
check: check-am
@@ -963,23 +959,23 @@
# with make distcheck rule
# -lannotationLanguageParser(appears after -lvaluePropagation)
- at USE_QROSE_TRUE@$(compass_build_tooldir)/compass/libCompassCheckers.la:
- at USE_QROSE_TRUE@ cd .. && $(MAKE) libCompassCheckers.la
+ at ROSE_USE_QROSE_TRUE@$(compass_build_tooldir)/compass/libCompassCheckers.la:
+ at ROSE_USE_QROSE_TRUE@ cd .. && $(MAKE) libCompassCheckers.la
- at USE_QROSE_TRUE@compass_parameters:
- at USE_QROSE_TRUE@ cd .. && $(MAKE) compass_parameters
- at USE_QROSE_TRUE@ cp -f ../compass_parameters .
+ at ROSE_USE_QROSE_TRUE@compass_parameters:
+ at ROSE_USE_QROSE_TRUE@ cd .. && $(MAKE) compass_parameters
+ at ROSE_USE_QROSE_TRUE@ cp -f ../compass_parameters .
- at USE_QROSE_TRUE@test: compass_parameters compassMainGui $(compass_test_dir)/exampleTest_1.C
- at USE_QROSE_TRUE@ env COMPASS_PARAMETERS=./compass_parameters ./compassMainGui $(compass_test_dir)/exampleTest_1.C
+ at ROSE_USE_QROSE_TRUE@test: compass_parameters compassMainGui $(compass_test_dir)/exampleTest_1.C
+ at ROSE_USE_QROSE_TRUE@ env COMPASS_PARAMETERS=./compass_parameters ./compassMainGui $(compass_test_dir)/exampleTest_1.C
- at USE_QROSE_TRUE@test2: compass_parameters compassMainGui $(compass_test_dir)/exampleTest_1.C $(compass_test_dir)/exampleTest_2.C
- at USE_QROSE_TRUE@ env COMPASS_PARAMETERS=./compass_parameters ./compassMainGui $(compass_test_dir)/exampleTest_1.C $(compass_checker_dir)/allowedFunctions/allowedFunctionsTest1.C
+ at ROSE_USE_QROSE_TRUE@test2: compass_parameters compassMainGui $(compass_test_dir)/exampleTest_1.C $(compass_test_dir)/exampleTest_2.C
+ at ROSE_USE_QROSE_TRUE@ env COMPASS_PARAMETERS=./compass_parameters ./compassMainGui $(compass_test_dir)/exampleTest_1.C $(compass_checker_dir)/allowedFunctions/allowedFunctionsTest1.C
- at USE_QROSE_TRUE@check-local:
- at USE_QROSE_TRUE@ @echo "************************************************************************************"
- at USE_QROSE_TRUE@ @echo "*** ROSE/projects/compass/tools/compass/gui: make check rule complete (terminated normally) ***"
- at USE_QROSE_TRUE@ @echo "************************************************************************************"
+ at ROSE_USE_QROSE_TRUE@check-local:
+ at ROSE_USE_QROSE_TRUE@ @echo "************************************************************************************"
+ at ROSE_USE_QROSE_TRUE@ @echo "*** ROSE/projects/compass/tools/compass/gui: make check rule complete (terminated normally) ***"
+ at ROSE_USE_QROSE_TRUE@ @echo "************************************************************************************"
# 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.
.NOEXPORT:
Modified: trunk/projects/compass/tools/compass/tests/C_tests/Makefile.in
===================================================================
--- trunk/projects/compass/tools/compass/tests/C_tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/compass/tools/compass/tests/C_tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/compass/tools/compass/tests/Cxx_tests/Makefile.in
===================================================================
--- trunk/projects/compass/tools/compass/tests/Cxx_tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/compass/tools/compass/tests/Cxx_tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/compass/tools/compass/tests/Makefile.in
===================================================================
--- trunk/projects/compass/tools/compass/tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/compass/tools/compass/tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -161,7 +161,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -212,8 +211,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -231,8 +228,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -243,8 +238,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -273,13 +266,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -324,6 +313,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -347,8 +338,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -395,8 +384,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -438,14 +425,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -457,32 +444,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -548,6 +536,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -593,10 +582,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/compass/tools/compassVerifier/Makefile.in
===================================================================
--- trunk/projects/compass/tools/compassVerifier/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/compass/tools/compassVerifier/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -100,7 +100,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -117,6 +116,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -144,7 +144,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -152,9 +153,10 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
libCompassVerifierCheckers_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6) $(compass_support_bdir)/libCompass.la
+ $(am__DEPENDENCIES_7) $(compass_support_bdir)/libCompass.la
am_libCompassVerifierCheckers_la_OBJECTS = buildCheckers.lo
libCompassVerifierCheckers_la_OBJECTS = \
$(am_libCompassVerifierCheckers_la_OBJECTS)
@@ -219,7 +221,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -270,8 +271,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -289,8 +288,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -301,8 +298,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -331,13 +326,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -382,6 +373,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -405,8 +398,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -453,8 +444,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -496,14 +485,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -515,32 +504,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -606,6 +596,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -651,10 +642,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/compass/tools/sampleCompassSubset/Makefile.in
===================================================================
--- trunk/projects/compass/tools/sampleCompassSubset/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/compass/tools/sampleCompassSubset/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -100,7 +100,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -117,6 +116,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -144,7 +144,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -152,9 +153,10 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
libSampleCompassSubsetCheckers_la_DEPENDENCIES = \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7) \
$(compass_support_bdir)/libCompass.la
am_libSampleCompassSubsetCheckers_la_OBJECTS = buildCheckers.lo
libSampleCompassSubsetCheckers_la_OBJECTS = \
@@ -220,7 +222,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -271,8 +272,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -290,8 +289,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -302,8 +299,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -332,13 +327,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -383,6 +374,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -406,8 +399,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -454,8 +445,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -497,14 +486,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -516,32 +505,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -607,6 +597,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -652,10 +643,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/dataStructureGraphing/Makefile.in
===================================================================
--- trunk/projects/dataStructureGraphing/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/dataStructureGraphing/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -93,7 +93,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -110,6 +109,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -136,7 +136,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -144,8 +145,9 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-cgraphpp_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+cgraphpp_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -202,7 +204,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -256,8 +257,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -275,8 +274,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -287,8 +284,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -317,13 +312,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -368,6 +359,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -391,8 +384,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -439,8 +430,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -482,14 +471,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -501,32 +490,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -592,6 +582,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -637,10 +628,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/highLevelGrammars/Makefile.in
===================================================================
--- trunk/projects/highLevelGrammars/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/highLevelGrammars/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -94,7 +94,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -111,6 +110,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -135,7 +135,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -143,16 +144,17 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
exampleTranslator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
am_highLevelGrammarGenerator_OBJECTS = \
highLevelGrammarGenerator.$(OBJEXT)
highLevelGrammarGenerator_OBJECTS = \
$(am_highLevelGrammarGenerator_OBJECTS)
highLevelGrammarGenerator_LDADD = $(LDADD)
highLevelGrammarGenerator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
am_overloadedOperatorRepresentation_OBJECTS = \
overloadedOperatorRepresentation.$(OBJEXT) \
AbstractionAttribute.$(OBJEXT)
@@ -160,7 +162,7 @@
$(am_overloadedOperatorRepresentation_OBJECTS)
overloadedOperatorRepresentation_LDADD = $(LDADD)
overloadedOperatorRepresentation_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -221,7 +223,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -272,8 +273,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -291,8 +290,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -303,8 +300,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -333,13 +328,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -384,6 +375,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -407,8 +400,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -455,8 +446,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -498,14 +487,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -517,32 +506,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -608,6 +598,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -653,10 +644,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/javaport/Makefile.in
===================================================================
--- trunk/projects/javaport/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/javaport/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -98,7 +98,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -115,6 +114,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -155,7 +155,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -163,16 +164,17 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
@ENABLE_JAVAPORT_TRUE at frontendAndDump_DEPENDENCIES = \
@ENABLE_JAVAPORT_TRUE@ $(am__DEPENDENCIES_1) \
- at ENABLE_JAVAPORT_TRUE@ $(am__DEPENDENCIES_7)
+ at ENABLE_JAVAPORT_TRUE@ $(am__DEPENDENCIES_8)
am__testlink_SOURCES_DIST = testlink.cc
@ENABLE_JAVAPORT_TRUE at am_testlink_OBJECTS = testlink.$(OBJEXT)
testlink_OBJECTS = $(am_testlink_OBJECTS)
@ENABLE_JAVAPORT_TRUE at testlink_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- at ENABLE_JAVAPORT_TRUE@ $(am__DEPENDENCIES_7) libsage3_wrap.la
+ at ENABLE_JAVAPORT_TRUE@ $(am__DEPENDENCIES_8) libsage3_wrap.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -227,7 +229,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -278,8 +279,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -297,8 +296,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -309,8 +306,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -339,13 +334,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -390,6 +381,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -413,8 +406,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -461,8 +452,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -504,14 +493,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -523,32 +512,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -614,6 +604,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -659,10 +650,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/palette/Makefile.in
===================================================================
--- trunk/projects/palette/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/palette/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -98,7 +98,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -115,6 +114,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -140,7 +140,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -148,12 +149,13 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
am_palette2cpp_OBJECTS = palette2cpp.$(OBJEXT) prologLexer.$(OBJEXT) \
prologParser.$(OBJEXT)
palette2cpp_OBJECTS = $(am_palette2cpp_OBJECTS)
palette2cpp_LDADD = $(LDADD)
-palette2cpp_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+palette2cpp_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
am_qsolve_OBJECTS = qsolve.$(OBJEXT)
qsolve_OBJECTS = $(am_qsolve_OBJECTS)
qsolve_LDADD = $(LDADD)
@@ -235,7 +237,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -286,8 +287,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -305,8 +304,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -317,8 +314,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -347,13 +342,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -398,6 +389,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -421,8 +414,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -469,8 +460,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -512,14 +501,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -531,32 +520,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -622,6 +612,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -667,10 +658,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/programModeling/Makefile.in
===================================================================
--- trunk/projects/programModeling/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/programModeling/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -93,7 +93,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -110,6 +109,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -139,7 +139,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -147,9 +148,10 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
@ROSE_USE_MAPLE_TRUE at loopTest_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- at ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_6) \
+ at ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_7) \
@ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_1)
am__mapleAPIExample2_SOURCES_DIST = mapleAPIExample2.c
@ROSE_USE_MAPLE_TRUE at am_mapleAPIExample2_OBJECTS = \
@@ -158,7 +160,7 @@
mapleAPIExample2_LDADD = $(LDADD)
@ROSE_USE_MAPLE_TRUE at mapleAPIExample2_DEPENDENCIES = \
@ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_1) \
- at ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_6) \
+ at ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_7) \
@ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_1)
am__mapleBugReport1_SOURCES_DIST = mapleBugReport1.c
@ROSE_USE_MAPLE_TRUE at am_mapleBugReport1_OBJECTS = \
@@ -167,7 +169,7 @@
mapleBugReport1_LDADD = $(LDADD)
@ROSE_USE_MAPLE_TRUE at mapleBugReport1_DEPENDENCIES = \
@ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_1) \
- at ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_6) \
+ at ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_7) \
@ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_1)
am__mapleRoseTest_SOURCES_DIST = mapleRoseTest.C
@ROSE_USE_MAPLE_TRUE at am_mapleRoseTest_OBJECTS = \
@@ -176,7 +178,7 @@
mapleRoseTest_LDADD = $(LDADD)
@ROSE_USE_MAPLE_TRUE at mapleRoseTest_DEPENDENCIES = \
@ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_1) \
- at ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_6) \
+ at ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_7) \
@ROSE_USE_MAPLE_TRUE@ $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
@@ -237,7 +239,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -288,8 +289,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -307,8 +306,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -319,8 +316,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -349,13 +344,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -400,6 +391,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -423,8 +416,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -471,8 +462,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -514,14 +503,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -533,32 +522,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -624,6 +614,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -669,10 +660,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/reverseComputation/Makefile.in
===================================================================
--- trunk/projects/reverseComputation/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/reverseComputation/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -93,7 +93,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -110,6 +109,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -136,7 +136,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -144,9 +145,10 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
simpleComputationReverser_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -203,7 +205,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -254,8 +255,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -273,8 +272,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -285,8 +282,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -315,13 +310,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -366,6 +357,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -389,8 +382,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -437,8 +428,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -480,14 +469,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -499,32 +488,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -590,6 +580,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -635,10 +626,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/runtimeErrorCheck/Makefile.in
===================================================================
--- trunk/projects/runtimeErrorCheck/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/runtimeErrorCheck/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -131,7 +131,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -139,10 +140,11 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
runtimeCheck_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -191,7 +193,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -242,8 +243,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -261,8 +260,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -273,8 +270,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -303,13 +298,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -354,6 +345,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -377,8 +370,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -425,8 +416,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -468,14 +457,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -487,32 +476,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -578,6 +568,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -623,10 +614,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/projects/simpleCallGraphAnalysis/Makefile.in
===================================================================
--- trunk/projects/simpleCallGraphAnalysis/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/projects/simpleCallGraphAnalysis/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -132,7 +132,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -140,13 +141,14 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-callGraph_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+callGraph_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
am_writeCallGraph_OBJECTS = writeCallGraph.$(OBJEXT)
writeCallGraph_OBJECTS = $(am_writeCallGraph_OBJECTS)
writeCallGraph_LDADD = $(LDADD)
writeCallGraph_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -195,7 +197,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -246,8 +247,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -265,8 +264,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -277,8 +274,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -307,13 +302,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -358,6 +349,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -381,8 +374,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -429,8 +420,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -472,14 +461,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -491,32 +480,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -582,6 +572,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -627,10 +618,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/rose_config.h.in
===================================================================
--- trunk/rose_config.h.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/rose_config.h.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -163,12 +163,6 @@
/* Define to 1 if you have the `dl' library (-ldl). */
#undef HAVE_LIBDL
-/* libjpeg present */
-#undef HAVE_LIBJPEG
-
-/* libpng present */
-#undef HAVE_LIBPNG
-
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
@@ -451,7 +445,8 @@
/* Controls use of ROSE support for PHP. */
#undef USE_ROSE_PHP_SUPPORT
-/* Wine provides access to Windows specific binary file format headers. */
+/* Wine provides access to Windows header files for analysis of windows
+ applications under Linux. */
#undef USE_ROSE_WINDOWS_ANALYSIS_SUPPORT
/* Controls use of ROSE support for Yices Satisfiability Modulo Theories (SMT)
Modified: trunk/scripts/Makefile.in
===================================================================
--- trunk/scripts/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/scripts/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -90,7 +90,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -107,6 +106,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -156,7 +156,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -207,8 +206,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -226,8 +223,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -238,8 +233,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -268,13 +261,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -319,6 +308,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -342,8 +333,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -390,8 +379,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -433,14 +420,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -452,32 +439,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -543,6 +531,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -588,10 +577,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/3rdPartyLibraries/MSTL/Makefile.in
===================================================================
--- trunk/src/3rdPartyLibraries/MSTL/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/3rdPartyLibraries/MSTL/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -179,7 +179,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -230,8 +229,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -249,8 +246,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -261,8 +256,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -291,13 +284,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -342,6 +331,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -365,8 +356,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -413,8 +402,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -456,14 +443,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -475,32 +462,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -566,6 +554,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -611,10 +600,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/3rdPartyLibraries/Makefile.in
===================================================================
--- trunk/src/3rdPartyLibraries/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/3rdPartyLibraries/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -65,7 +65,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -82,6 +81,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -137,7 +137,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -188,8 +187,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -207,8 +204,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -219,8 +214,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -249,13 +242,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -300,6 +289,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -323,8 +314,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -371,8 +360,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/src/3rdPartyLibraries/antlr-jars/Makefile.in
===================================================================
--- trunk/src/3rdPartyLibraries/antlr-jars/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/3rdPartyLibraries/antlr-jars/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -64,7 +64,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -81,6 +80,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -136,7 +136,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -187,8 +186,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -206,8 +203,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -218,8 +213,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -248,13 +241,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -299,6 +288,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -322,8 +313,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -370,8 +359,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/src/3rdPartyLibraries/fortran-parser/Makefile.in
===================================================================
--- trunk/src/3rdPartyLibraries/fortran-parser/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/3rdPartyLibraries/fortran-parser/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -83,7 +83,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -100,6 +99,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -155,7 +155,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -206,8 +205,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -225,8 +222,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -237,8 +232,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -267,13 +260,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -318,6 +307,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -341,8 +332,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -389,8 +378,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -94,7 +94,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -111,6 +110,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -197,7 +197,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_10 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_11 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_11 = $(am__DEPENDENCIES_5)
+am__DEPENDENCIES_12 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_8) $(am__DEPENDENCIES_7) \
$(am__DEPENDENCIES_5) $(am__DEPENDENCIES_5) \
$(am__DEPENDENCIES_5) $(am__DEPENDENCIES_5) \
@@ -205,7 +206,8 @@
$(am__DEPENDENCIES_5) $(am__DEPENDENCIES_5) \
$(am__DEPENDENCIES_5) $(am__DEPENDENCIES_5) \
$(am__DEPENDENCIES_5) $(am__DEPENDENCIES_5) \
- $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_10)
+ $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_10) \
+ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_11)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -263,7 +265,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -314,8 +315,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -333,8 +332,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -345,8 +342,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -375,13 +370,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -426,6 +417,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -449,8 +442,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -497,8 +488,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -540,14 +529,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -559,32 +548,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -650,6 +640,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -695,10 +686,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/ROSETTA/Makefile.in
===================================================================
--- trunk/src/ROSETTA/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/ROSETTA/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -161,7 +161,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -212,8 +211,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -231,8 +228,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -243,8 +238,6 @@
LIBS = @LIBS@ ${ROSETTA_LIBS}
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -273,13 +266,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -324,6 +313,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -347,8 +338,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -395,8 +384,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -438,14 +425,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -457,32 +444,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -548,6 +536,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -593,10 +582,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/ROSETTA/src/Makefile.am
===================================================================
--- trunk/src/ROSETTA/src/Makefile.am 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/ROSETTA/src/Makefile.am 2008-09-12 20:14:11 UTC (rev 32)
@@ -157,13 +157,20 @@
CxxGrammarMetaProgram_LDADD = $(top_builddir)/src/util/libroseutil.la
+# DQ (9/11/2008):
+# The rose_paths.c is built in ROSE/src/util and this dependence causes
+# ROSE to rebuild a lot of code each time configure is rerun. Let's see
+# if this can be make a little more tolerable for those without larger
+# computers working on ROSE (e.g. students).
+# CxxGrammarMetaProgram_DEPENDENCIES = $(CxxGrammarMetaProgram_LDADD)
+CxxGrammarMetaProgram_DEPENDENCIES =
+
+
# DQ (7/8/2005): Avoid building Sage III when util changes!
# $(top_builddir)/util/libroseutil.so:
# cd $(top_builddir)/util; $(MAKE)
-CxxGrammarMetaProgram_DEPENDENCIES = $(CxxGrammarMetaProgram_LDADD)
-
# Force recompilation of source files if any of the header files
# are changed (does not work if *.o files are not present).
$(librosetta_a_OBJECTS): ROSETTA_macros.h grammar.h grammarString.h terminal.h
Modified: trunk/src/ROSETTA/src/Makefile.in
===================================================================
--- trunk/src/ROSETTA/src/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/ROSETTA/src/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -176,7 +176,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -230,8 +229,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -249,8 +246,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -261,8 +256,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -291,13 +284,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -342,6 +331,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -365,8 +356,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -413,8 +402,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -456,14 +443,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -475,32 +462,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -566,6 +554,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -611,10 +600,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
@@ -707,10 +698,13 @@
CxxGrammarMetaProgram_LDADD = $(top_builddir)/src/util/libroseutil.la
-# DQ (7/8/2005): Avoid building Sage III when util changes!
-# $(top_builddir)/util/libroseutil.so:
-# cd $(top_builddir)/util; $(MAKE)
-CxxGrammarMetaProgram_DEPENDENCIES = $(CxxGrammarMetaProgram_LDADD)
+# DQ (9/11/2008):
+# The rose_paths.c is built in ROSE/src/util and this dependence causes
+# ROSE to rebuild a lot of code each time configure is rerun. Let's see
+# if this can be make a little more tolerable for those without larger
+# computers working on ROSE (e.g. students).
+# CxxGrammarMetaProgram_DEPENDENCIES = $(CxxGrammarMetaProgram_LDADD)
+CxxGrammarMetaProgram_DEPENDENCIES =
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -1035,6 +1029,10 @@
rm -f $(CXX_GRAMMAR_DIR)/Cxx_GrammarGetChildIndex.C
mv Cxx_GrammarGetChildIndex.C $(CXX_GRAMMAR_DIR)/Cxx_GrammarGetChildIndex.C
+# DQ (7/8/2005): Avoid building Sage III when util changes!
+# $(top_builddir)/util/libroseutil.so:
+# cd $(top_builddir)/util; $(MAKE)
+
# Force recompilation of source files if any of the header files
# are changed (does not work if *.o files are not present).
$(librosetta_a_OBJECTS): ROSETTA_macros.h grammar.h grammarString.h terminal.h
Modified: trunk/src/backend/Makefile.in
===================================================================
--- trunk/src/backend/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/backend/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -90,7 +90,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -107,6 +106,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -162,7 +162,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -213,8 +212,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -232,8 +229,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -244,8 +239,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -274,13 +267,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -325,6 +314,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -348,8 +339,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -396,8 +385,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -439,14 +426,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -458,32 +445,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -549,6 +537,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -594,10 +583,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/backend/asmUnparser/Makefile.in
===================================================================
--- trunk/src/backend/asmUnparser/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/backend/asmUnparser/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -180,7 +180,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -231,8 +230,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -250,8 +247,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -262,8 +257,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -292,13 +285,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -343,6 +332,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -366,8 +357,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -414,8 +403,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -457,14 +444,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -476,32 +463,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -567,6 +555,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -612,10 +601,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/backend/unparser/CxxCodeGeneration/Makefile.in
===================================================================
--- trunk/src/backend/unparser/CxxCodeGeneration/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/backend/unparser/CxxCodeGeneration/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -180,7 +180,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -231,8 +230,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -250,8 +247,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -262,8 +257,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -292,13 +285,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -343,6 +332,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -366,8 +357,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -414,8 +403,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -457,14 +444,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -476,32 +463,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -567,6 +555,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -612,10 +601,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/backend/unparser/FortranCodeGeneration/Makefile.in
===================================================================
--- trunk/src/backend/unparser/FortranCodeGeneration/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/backend/unparser/FortranCodeGeneration/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -180,7 +180,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -231,8 +230,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -250,8 +247,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -262,8 +257,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -292,13 +285,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -343,6 +332,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -366,8 +357,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -414,8 +403,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -457,14 +444,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -476,32 +463,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -567,6 +555,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -612,10 +601,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/backend/unparser/Makefile.in
===================================================================
--- trunk/src/backend/unparser/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/backend/unparser/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -195,7 +195,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -246,8 +245,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -265,8 +262,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -277,8 +272,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -307,13 +300,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -358,6 +347,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -381,8 +372,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -429,8 +418,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -472,14 +459,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -491,32 +478,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -582,6 +570,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -627,10 +616,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/backend/unparser/PHPCodeGeneration/Makefile.in
===================================================================
--- trunk/src/backend/unparser/PHPCodeGeneration/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/backend/unparser/PHPCodeGeneration/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -179,7 +179,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -230,8 +229,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -249,8 +246,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -261,8 +256,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -291,13 +284,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -342,6 +331,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -365,8 +356,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -413,8 +402,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -456,14 +443,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -475,32 +462,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -566,6 +554,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -611,10 +600,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/backend/unparser/formatSupport/Makefile.in
===================================================================
--- trunk/src/backend/unparser/formatSupport/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/backend/unparser/formatSupport/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -181,7 +181,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -232,8 +231,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -251,8 +248,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -263,8 +258,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -293,13 +286,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -344,6 +333,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -367,8 +358,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -415,8 +404,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -458,14 +445,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -477,32 +464,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -568,6 +556,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -613,10 +602,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/backend/unparser/languageIndependenceSupport/Makefile.in
===================================================================
--- trunk/src/backend/unparser/languageIndependenceSupport/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/backend/unparser/languageIndependenceSupport/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -183,7 +183,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -234,8 +233,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -253,8 +250,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -265,8 +260,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -295,13 +288,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -346,6 +335,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -369,8 +360,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -417,8 +406,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -460,14 +447,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -479,32 +466,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -570,6 +558,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -615,10 +604,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/frontend/BinaryDisassembly/Makefile.in
===================================================================
--- trunk/src/frontend/BinaryDisassembly/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/frontend/BinaryDisassembly/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -229,7 +229,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -280,8 +279,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -299,8 +296,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -311,8 +306,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -341,13 +334,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -392,6 +381,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -415,8 +406,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -463,8 +452,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -506,14 +493,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -525,32 +512,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -616,6 +604,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -661,10 +650,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/frontend/CxxFrontend/Makefile.in
===================================================================
--- trunk/src/frontend/CxxFrontend/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/frontend/CxxFrontend/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -90,7 +90,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -107,6 +106,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -165,7 +165,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -216,8 +215,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -235,8 +232,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -247,8 +242,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -277,13 +270,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -328,6 +317,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -351,8 +342,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -399,8 +388,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -442,14 +429,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -461,32 +448,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -552,6 +540,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -597,10 +586,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/frontend/CxxFrontend/roseBinaryEDG-i686-pc-linux-gnu-2a1162d3a85dcf3ac377bd85dfed116c.tar.gz
===================================================================
(Binary files differ)
Modified: trunk/src/frontend/Disassemblers/Makefile.in
===================================================================
--- trunk/src/frontend/Disassemblers/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/frontend/Disassemblers/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -189,7 +189,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -240,8 +239,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -259,8 +256,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -271,8 +266,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -301,13 +294,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -352,6 +341,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -375,8 +366,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -423,8 +412,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -466,14 +453,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -485,32 +472,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -576,6 +564,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -621,10 +610,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/frontend/ExecFormats/Makefile.in
===================================================================
--- trunk/src/frontend/ExecFormats/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/frontend/ExecFormats/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -179,7 +179,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -230,8 +229,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -249,8 +246,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -261,8 +256,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -291,13 +284,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -342,6 +331,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -365,8 +356,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -413,8 +402,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -456,14 +443,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -475,32 +462,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -566,6 +554,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -611,10 +600,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/frontend/Makefile.in
===================================================================
--- trunk/src/frontend/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/frontend/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -161,7 +161,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -212,8 +211,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -231,8 +228,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -243,8 +238,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -273,13 +266,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -324,6 +313,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -347,8 +338,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -395,8 +384,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -438,14 +425,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -457,32 +444,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -548,6 +536,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -593,10 +582,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/frontend/OpenFortranParser_SAGE_Connection/Makefile.in
===================================================================
--- trunk/src/frontend/OpenFortranParser_SAGE_Connection/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/frontend/OpenFortranParser_SAGE_Connection/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -211,7 +211,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -262,8 +261,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -281,8 +278,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -293,8 +288,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -323,13 +316,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -374,6 +363,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -397,8 +388,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -445,8 +434,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -488,14 +475,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -507,32 +494,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -598,6 +586,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -643,10 +632,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/frontend/PHPFrontend/Makefile.in
===================================================================
--- trunk/src/frontend/PHPFrontend/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/frontend/PHPFrontend/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -186,7 +186,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -237,8 +236,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -256,8 +253,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -268,8 +263,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -298,13 +291,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -349,6 +338,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -372,8 +363,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -420,8 +409,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -463,14 +450,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -482,32 +469,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -573,6 +561,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -618,10 +607,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/frontend/SageIII/Makefile.in
===================================================================
--- trunk/src/frontend/SageIII/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/frontend/SageIII/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -227,7 +227,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -278,8 +277,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -297,8 +294,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -309,8 +304,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -339,13 +332,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -390,6 +379,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -413,8 +404,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -461,8 +450,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -504,14 +491,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -523,32 +510,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -614,6 +602,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -659,10 +648,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/frontend/SageIII/astFileIO/Makefile.in
===================================================================
--- trunk/src/frontend/SageIII/astFileIO/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/frontend/SageIII/astFileIO/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -166,7 +166,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -217,8 +216,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -236,8 +233,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -248,8 +243,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -278,13 +271,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -329,6 +318,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -352,8 +343,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -400,8 +389,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -443,14 +430,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -462,32 +449,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -553,6 +541,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -598,10 +587,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/frontend/SageIII/astFixup/Makefile.in
===================================================================
--- trunk/src/frontend/SageIII/astFixup/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/frontend/SageIII/astFixup/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -182,7 +182,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -233,8 +232,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -252,8 +249,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -264,8 +259,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -294,13 +287,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -345,6 +334,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -368,8 +359,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -416,8 +405,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -459,14 +446,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -478,32 +465,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -569,6 +557,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -614,10 +603,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/frontend/SageIII/astHiddenTypeAndDeclarationLists/Makefile.in
===================================================================
--- trunk/src/frontend/SageIII/astHiddenTypeAndDeclarationLists/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/frontend/SageIII/astHiddenTypeAndDeclarationLists/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -180,7 +180,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -231,8 +230,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -250,8 +247,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -262,8 +257,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -292,13 +285,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -343,6 +332,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -366,8 +357,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -414,8 +403,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -457,14 +444,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -476,32 +463,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -567,6 +555,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -612,10 +601,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/frontend/SageIII/astMerge/Makefile.in
===================================================================
--- trunk/src/frontend/SageIII/astMerge/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/frontend/SageIII/astMerge/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -182,7 +182,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -233,8 +232,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -252,8 +249,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -264,8 +259,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -294,13 +287,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -345,6 +334,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -368,8 +359,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -416,8 +405,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -459,14 +446,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -478,32 +465,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -569,6 +557,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -614,10 +603,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/frontend/SageIII/astPostProcessing/Makefile.in
===================================================================
--- trunk/src/frontend/SageIII/astPostProcessing/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/frontend/SageIII/astPostProcessing/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -193,7 +193,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -244,8 +243,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -263,8 +260,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -275,8 +270,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -305,13 +298,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -356,6 +345,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -379,8 +370,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -427,8 +416,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -470,14 +457,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -489,32 +476,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -580,6 +568,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -625,10 +614,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/frontend/SageIII/astTokenStream/Makefile.in
===================================================================
--- trunk/src/frontend/SageIII/astTokenStream/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/frontend/SageIII/astTokenStream/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -93,7 +93,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -110,6 +109,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -185,7 +185,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -236,8 +235,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -255,8 +252,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -267,8 +262,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -297,13 +290,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -348,6 +337,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -371,8 +362,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -419,8 +408,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -462,14 +449,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -481,32 +468,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -572,6 +560,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -617,10 +606,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/frontend/SageIII/astVisualization/Makefile.in
===================================================================
--- trunk/src/frontend/SageIII/astVisualization/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/frontend/SageIII/astVisualization/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -178,7 +178,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -229,8 +228,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -248,8 +245,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -260,8 +255,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -290,13 +283,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -341,6 +330,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -364,8 +355,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -412,8 +401,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -455,14 +442,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -474,32 +461,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -565,6 +553,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -610,10 +599,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/frontend/SageIII/sageInterface/Makefile.in
===================================================================
--- trunk/src/frontend/SageIII/sageInterface/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/frontend/SageIII/sageInterface/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -179,7 +179,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -230,8 +229,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -249,8 +246,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -261,8 +256,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -291,13 +284,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -342,6 +331,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -365,8 +356,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -413,8 +402,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -456,14 +443,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -475,32 +462,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -566,6 +554,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -611,10 +600,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/frontend/SageIII/sageSupport.C
===================================================================
--- trunk/src/frontend/SageIII/sageSupport.C 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/frontend/SageIII/sageSupport.C 2008-09-12 20:14:11 UTC (rev 32)
@@ -5500,7 +5500,9 @@
{
if (inheritedAttribute.treeDepth > maxDepth)
maxDepth = inheritedAttribute.treeDepth;
-
+#if 0
+ printf ("maxDepth = %d for IR nodes = %p = %s \n",maxDepth,astNode,astNode->class_name().c_str());
+#endif
return DepthInheritedAttribute(inheritedAttribute.treeDepth + 1);
}
};
Modified: trunk/src/frontend/SageIII/virtualCFG/Makefile.in
===================================================================
--- trunk/src/frontend/SageIII/virtualCFG/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/frontend/SageIII/virtualCFG/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -178,7 +178,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -229,8 +228,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -248,8 +245,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -260,8 +255,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -290,13 +283,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -341,6 +330,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -364,8 +355,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -412,8 +401,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -455,14 +442,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -474,32 +461,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -565,6 +553,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -610,10 +599,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/Makefile.in
===================================================================
--- trunk/src/midend/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -161,7 +161,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -212,8 +211,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -231,8 +228,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -243,8 +238,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -273,13 +266,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -324,6 +313,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -347,8 +338,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -395,8 +384,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -438,14 +425,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -457,32 +444,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -548,6 +536,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -593,10 +582,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/astDiagnostics/Makefile.in
===================================================================
--- trunk/src/midend/astDiagnostics/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/astDiagnostics/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -179,7 +179,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -230,8 +229,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -249,8 +246,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -261,8 +256,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -291,13 +284,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -342,6 +331,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -365,8 +356,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -413,8 +402,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -456,14 +443,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -475,32 +462,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -566,6 +554,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -611,10 +600,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/astInlining/Makefile.in
===================================================================
--- trunk/src/midend/astInlining/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/astInlining/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -180,7 +180,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -231,8 +230,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -250,8 +247,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -262,8 +257,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -292,13 +285,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -343,6 +332,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -366,8 +357,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -414,8 +403,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -457,14 +444,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -476,32 +463,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -567,6 +555,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -612,10 +601,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/astOutlining/GenerateFunc.cc
===================================================================
--- trunk/src/midend/astOutlining/GenerateFunc.cc 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/astOutlining/GenerateFunc.cc 2008-09-12 20:14:11 UTC (rev 32)
@@ -26,6 +26,8 @@
// =====================================================================
using namespace std;
+using namespace SageInterface;
+using namespace SageBuilder;
/* ===========================================================
*/
@@ -190,6 +192,12 @@
* \brief Creates a local variable declaration to "unpack" an
* outlined-function parameter that has been passed as a pointer
* value.
+ *
+ * OUT_XXX(int *ip__)
+ * {
+ * // This is call unpacking declaration, Liao, 9/11/2008
+ * int i = * (int *) ip__;
+ * }
*/
static
SgVariableDeclaration *
@@ -205,6 +213,7 @@
param_sym);
ROSE_ASSERT (param_ref);
+ // the original data type of the variable
SgType* param_deref_type = const_cast<SgType *> (local_var_type);
ROSE_ASSERT (param_deref_type);
@@ -237,10 +246,27 @@
new SgAssignInitializer (ASTtools::newFileInfo (),
param_deref_expr, param_deref_type);
ROSE_ASSERT (local_val);
- SgType* local_type = isSgReferenceType (param_deref_type)
- ? param_deref_type
- : SgReferenceType::createType (param_deref_type);
+
+ SgType* local_type = NULL;
+// Rich's idea was to leverage C++'s reference type: two cases:
+// a) for variables of reference type: no additional work
+// b) for others: make a reference type to them
+// all variable accesses in the outlined function will have
+// access the address of the by default, not variable substitution is needed
+// but this method won't work for non-C++ code, where & on left side of assignment
+// is not recognized at all.
+ if (is_C_language())
+ {
+ //TODO more C cases
+ local_type = param_deref_type;
+ }
+ else
+ {
+ local_type= isSgReferenceType(param_deref_type)
+ ?param_deref_type:SgReferenceType::createType(param_deref_type);
+ }
ROSE_ASSERT (local_type);
+
SgVariableDeclaration* decl =
new SgVariableDeclaration (ASTtools::newFileInfo (),
local_name, local_type, local_val);
@@ -334,10 +360,23 @@
}
/*!
- * \brief qCreates a pack statement.
+ * \brief Creates a pack statement
*
* This routine creates an SgExprStatement wrapper around the return
* of createPackExpr.
+ *
+ * void OUT__1__4305__(int *ip__,int *sump__)
+ * {
+ * int i = *((int *)ip__);
+ * int sum = *((int *)sump__);
+ * for (i = 0; i < 100; i++) {
+ * sum += i;
+ * }
+ * //The following are called (re)pack statements
+ * *((int *)sump__) = sum;
+ * *((int *)ip__) = i;
+}
+
*/
static
SgExprStatement *
@@ -463,7 +502,7 @@
p_init_name->set_parent (params); //!< \todo Set in 'createInitName()'?
p_init_name->set_scope (def); //!< \todo Set in 'createInitName()'?
- // pack/unpack is not necessary for Frotran, Liao 12/14/2007
+ // pack/unpack is not necessary for Fortran, Liao 12/14/2007
if (!SageInterface::is_Fortran_language())
{
// Create and insert unpack statement.
@@ -486,11 +525,11 @@
//TODO Not sure the right scope for Fortran parameter, assuming function definition now
// recordSymRemap() has two instances: the 2nd parameter could be initialized name in one case
// p_init_name should already have a symbol associated with it after call createInitName()
- // pass NULL scope to avoid duplicated insertation
+ // pass NULL scope to avoid duplicated insertion
//recordSymRemap (*i, i_name, def, sym_remap);
recordSymRemap (*i, p_init_name, NULL, sym_remap);
- // Liao, 12/26/2007, addtional work for Fortran
+ // Liao, 12/26/2007, additional work for Fortran
// for translator-generated arguments, prepend explicit type specifications to the body
SgVariableDeclaration * varDecl= new SgVariableDeclaration(ASTtools::newFileInfo (),\
p_sg_name,i_type,NULL);
@@ -562,8 +601,18 @@
SgFunctionSymbol * func_symbol = new SgFunctionSymbol(func);
const_cast<SgBasicBlock *>(s)->insert_symbol(func->get_name(), func_symbol);
-// not apply to Fortran
- if (!SageInterface::is_Fortran_language())
+// Only apply to C++ , pure C has trouble in recognizing extern "C"
+// Another way is to attach the function with preprocessing info:
+// #if __cplusplus
+// extern "C"
+// #endif
+// We don't choose it since the language linkage information is not explicit in AST
+// if (!SageInterface::is_Fortran_language())
+ if (SageInterface::is_Cxx_language()||
+ is_mixed_C_and_Cxx_language ()||
+ is_mixed_Fortran_and_Cxx_language ()||
+ is_mixed_Fortran_and_C_and_Cxx_language ()
+ )
{
// Make function 'extern "C"'
func->get_declarationModifier ().get_storageModifier ().setExtern ();
Modified: trunk/src/midend/astOutlining/Makefile.in
===================================================================
--- trunk/src/midend/astOutlining/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/astOutlining/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -185,7 +185,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -236,8 +235,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -255,8 +252,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -267,8 +262,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -297,13 +290,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -348,6 +337,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -371,8 +362,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -419,8 +408,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -462,14 +449,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -481,32 +468,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -572,6 +560,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -617,10 +606,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/astProcessing/Makefile.in
===================================================================
--- trunk/src/midend/astProcessing/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/astProcessing/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -193,7 +193,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -244,8 +243,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -263,8 +260,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -275,8 +270,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -305,13 +298,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -356,6 +345,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -379,8 +370,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -427,8 +416,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -470,14 +457,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -489,32 +476,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -580,6 +568,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -625,10 +614,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/astQuery/Makefile.in
===================================================================
--- trunk/src/midend/astQuery/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/astQuery/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -183,7 +183,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -234,8 +233,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -253,8 +250,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -265,8 +260,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -295,13 +288,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -346,6 +335,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -369,8 +360,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -417,8 +406,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -460,14 +447,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -479,32 +466,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -570,6 +558,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -615,10 +604,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/astRewriteMechanism/Makefile.in
===================================================================
--- trunk/src/midend/astRewriteMechanism/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/astRewriteMechanism/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -192,7 +192,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -243,8 +242,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -262,8 +259,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -274,8 +269,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -304,13 +297,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -355,6 +344,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -378,8 +369,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -426,8 +415,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -469,14 +456,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -488,32 +475,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -579,6 +567,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -624,10 +613,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/astUtil/Makefile.in
===================================================================
--- trunk/src/midend/astUtil/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/astUtil/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -161,7 +161,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -212,8 +211,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -231,8 +228,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -243,8 +238,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -273,13 +266,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -324,6 +313,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -347,8 +338,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -395,8 +384,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -438,14 +425,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -457,32 +444,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -548,6 +536,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -593,10 +582,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/astUtil/annotation/Makefile.in
===================================================================
--- trunk/src/midend/astUtil/annotation/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/astUtil/annotation/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -181,7 +181,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -232,8 +231,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -251,8 +248,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -263,8 +258,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -293,13 +286,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -344,6 +333,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -367,8 +358,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -415,8 +404,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -458,14 +445,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -477,32 +464,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -568,6 +556,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -613,10 +602,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/astUtil/astInterface/Makefile.in
===================================================================
--- trunk/src/midend/astUtil/astInterface/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/astUtil/astInterface/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -179,7 +179,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -230,8 +229,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -249,8 +246,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -261,8 +256,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -291,13 +284,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -342,6 +331,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -365,8 +356,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -413,8 +402,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -456,14 +443,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -475,32 +462,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -566,6 +554,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -611,10 +600,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/astUtil/astSupport/Makefile.in
===================================================================
--- trunk/src/midend/astUtil/astSupport/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/astUtil/astSupport/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -179,7 +179,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -230,8 +229,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -249,8 +246,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -261,8 +256,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -291,13 +284,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -342,6 +331,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -365,8 +356,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -413,8 +402,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -456,14 +443,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -475,32 +462,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -566,6 +554,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -611,10 +600,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/astUtil/symbolicVal/Makefile.in
===================================================================
--- trunk/src/midend/astUtil/symbolicVal/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/astUtil/symbolicVal/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -180,7 +180,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -231,8 +230,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -250,8 +247,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -262,8 +257,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -292,13 +285,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -343,6 +332,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -366,8 +357,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -414,8 +403,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -457,14 +444,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -476,32 +463,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -567,6 +555,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -612,10 +601,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/loopProcessing/Makefile.in
===================================================================
--- trunk/src/midend/loopProcessing/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/loopProcessing/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -161,7 +161,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -212,8 +211,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -231,8 +228,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -243,8 +238,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -273,13 +266,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -324,6 +313,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -347,8 +338,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -395,8 +384,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -438,14 +425,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -457,32 +444,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -548,6 +536,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -593,10 +582,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/loopProcessing/computation/Makefile.in
===================================================================
--- trunk/src/midend/loopProcessing/computation/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/loopProcessing/computation/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -181,7 +181,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -232,8 +231,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -251,8 +248,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -263,8 +258,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -293,13 +286,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -344,6 +333,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -367,8 +358,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -415,8 +404,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -458,14 +445,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -477,32 +464,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -568,6 +556,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -613,10 +602,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/loopProcessing/depGraph/Makefile.in
===================================================================
--- trunk/src/midend/loopProcessing/depGraph/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/loopProcessing/depGraph/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -179,7 +179,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -230,8 +229,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -249,8 +246,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -261,8 +256,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -291,13 +284,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -342,6 +331,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -365,8 +356,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -413,8 +402,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -456,14 +443,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -475,32 +462,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -566,6 +554,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -611,10 +600,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/loopProcessing/depInfo/Makefile.in
===================================================================
--- trunk/src/midend/loopProcessing/depInfo/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/loopProcessing/depInfo/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -180,7 +180,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -231,8 +230,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -250,8 +247,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -262,8 +257,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -292,13 +285,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -343,6 +332,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -366,8 +357,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -414,8 +403,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -457,14 +444,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -476,32 +463,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -567,6 +555,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -612,10 +601,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/loopProcessing/driver/Makefile.in
===================================================================
--- trunk/src/midend/loopProcessing/driver/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/loopProcessing/driver/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -182,7 +182,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -233,8 +232,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -252,8 +249,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -264,8 +259,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -294,13 +287,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -345,6 +334,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -368,8 +359,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -416,8 +405,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -459,14 +446,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -478,32 +465,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -569,6 +557,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -614,10 +603,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/loopProcessing/prepostTransformation/Makefile.in
===================================================================
--- trunk/src/midend/loopProcessing/prepostTransformation/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/loopProcessing/prepostTransformation/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -179,7 +179,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -230,8 +229,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -249,8 +246,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -261,8 +256,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -291,13 +284,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -342,6 +331,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -365,8 +356,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -413,8 +402,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -456,14 +443,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -475,32 +462,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -566,6 +554,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -611,10 +600,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/loopProcessing/slicing/Makefile.in
===================================================================
--- trunk/src/midend/loopProcessing/slicing/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/loopProcessing/slicing/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -180,7 +180,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -231,8 +230,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -250,8 +247,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -262,8 +257,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -292,13 +285,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -343,6 +332,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -366,8 +357,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -414,8 +403,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -457,14 +444,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -476,32 +463,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -567,6 +555,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -612,10 +601,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/programAnalysis/CFG/Makefile.in
===================================================================
--- trunk/src/midend/programAnalysis/CFG/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/programAnalysis/CFG/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -179,7 +179,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -230,8 +229,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -249,8 +246,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -261,8 +256,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -291,13 +284,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -342,6 +331,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -365,8 +356,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -413,8 +402,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -456,14 +443,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -475,32 +462,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -566,6 +554,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -611,10 +600,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/programAnalysis/CallGraphAnalysis/Makefile.in
===================================================================
--- trunk/src/midend/programAnalysis/CallGraphAnalysis/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/programAnalysis/CallGraphAnalysis/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -179,7 +179,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -230,8 +229,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -249,8 +246,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -261,8 +256,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -291,13 +284,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -342,6 +331,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -365,8 +356,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -413,8 +402,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -456,14 +443,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -475,32 +462,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -566,6 +554,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -611,10 +600,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/programAnalysis/Makefile.in
===================================================================
--- trunk/src/midend/programAnalysis/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/programAnalysis/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -161,7 +161,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -217,8 +216,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -236,8 +233,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -248,8 +243,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -278,13 +271,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -329,6 +318,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -352,8 +343,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -400,8 +389,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -443,14 +430,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -462,32 +449,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -553,6 +541,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -598,10 +587,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/programAnalysis/OAWrap/Makefile.in
===================================================================
--- trunk/src/midend/programAnalysis/OAWrap/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/programAnalysis/OAWrap/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -179,7 +179,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -230,8 +229,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -249,8 +246,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -261,8 +256,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -291,13 +284,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -342,6 +331,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -365,8 +356,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -413,8 +402,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -456,14 +443,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -475,32 +462,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -566,6 +554,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -611,10 +600,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/programAnalysis/annotationLanguageParser/Makefile.in
===================================================================
--- trunk/src/midend/programAnalysis/annotationLanguageParser/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/programAnalysis/annotationLanguageParser/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -189,7 +189,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -240,8 +239,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -259,8 +256,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -271,8 +266,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -301,13 +294,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -352,6 +341,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -375,8 +366,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -423,8 +412,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -466,14 +453,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -485,32 +472,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -576,6 +564,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -621,10 +610,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/programAnalysis/dataflowAnalysis/Makefile.in
===================================================================
--- trunk/src/midend/programAnalysis/dataflowAnalysis/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/programAnalysis/dataflowAnalysis/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -180,7 +180,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -231,8 +230,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -250,8 +247,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -262,8 +257,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -292,13 +285,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -343,6 +332,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -366,8 +357,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -414,8 +403,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -457,14 +444,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -476,32 +463,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -567,6 +555,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -612,10 +601,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/programAnalysis/defUseAnalysis/Makefile.in
===================================================================
--- trunk/src/midend/programAnalysis/defUseAnalysis/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/programAnalysis/defUseAnalysis/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -179,7 +179,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -230,8 +229,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -249,8 +246,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -261,8 +256,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -291,13 +284,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -342,6 +331,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -365,8 +356,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -413,8 +402,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -456,14 +443,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -475,32 +462,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -566,6 +554,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -611,10 +600,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/programAnalysis/distributedMemoryAnalysis/Makefile.in
===================================================================
--- trunk/src/midend/programAnalysis/distributedMemoryAnalysis/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/programAnalysis/distributedMemoryAnalysis/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -186,7 +186,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -237,8 +236,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -256,8 +253,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -268,8 +263,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -298,13 +291,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -349,6 +338,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -372,8 +363,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -420,8 +409,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -463,14 +450,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -482,32 +469,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -573,6 +561,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -618,10 +607,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/programAnalysis/dominanceAnalysis/Makefile.in
===================================================================
--- trunk/src/midend/programAnalysis/dominanceAnalysis/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/programAnalysis/dominanceAnalysis/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -165,7 +165,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -216,8 +215,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -235,8 +232,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -247,8 +242,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -277,13 +270,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -328,6 +317,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -351,8 +342,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -399,8 +388,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -442,14 +429,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -461,32 +448,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -552,6 +540,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -597,10 +586,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/programAnalysis/pointerAnal/Makefile.in
===================================================================
--- trunk/src/midend/programAnalysis/pointerAnal/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/programAnalysis/pointerAnal/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -178,7 +178,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -229,8 +228,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -248,8 +245,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -260,8 +255,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -290,13 +283,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -341,6 +330,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -364,8 +355,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -412,8 +401,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -455,14 +442,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -474,32 +461,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -565,6 +553,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -610,10 +599,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/programAnalysis/sideEffectAnalysis/Makefile.in
===================================================================
--- trunk/src/midend/programAnalysis/sideEffectAnalysis/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/programAnalysis/sideEffectAnalysis/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -182,7 +182,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -233,8 +232,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -252,8 +249,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -264,8 +259,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -294,13 +287,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -345,6 +334,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -368,8 +359,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -416,8 +405,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -459,14 +446,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -478,32 +465,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -569,6 +557,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -614,10 +603,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/programAnalysis/staticInterproceduralSlicing/Makefile.in
===================================================================
--- trunk/src/midend/programAnalysis/staticInterproceduralSlicing/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/programAnalysis/staticInterproceduralSlicing/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -182,7 +182,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -233,8 +232,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -252,8 +249,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -264,8 +259,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -294,13 +287,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -345,6 +334,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -368,8 +359,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -416,8 +405,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -459,14 +446,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -478,32 +465,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -569,6 +557,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -614,10 +603,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/programAnalysis/valuePropagation/Makefile.in
===================================================================
--- trunk/src/midend/programAnalysis/valuePropagation/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/programAnalysis/valuePropagation/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -179,7 +179,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -230,8 +229,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -249,8 +246,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -261,8 +256,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -291,13 +284,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -342,6 +331,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -365,8 +356,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -413,8 +402,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -456,14 +443,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -475,32 +462,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -566,6 +554,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -611,10 +600,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/programTransformation/Makefile.in
===================================================================
--- trunk/src/midend/programTransformation/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/programTransformation/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -161,7 +161,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -212,8 +211,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -231,8 +228,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -243,8 +238,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -273,13 +266,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -324,6 +313,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -347,8 +338,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -395,8 +384,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -438,14 +425,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -457,32 +444,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -548,6 +536,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -593,10 +582,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/programTransformation/constantFolding/Makefile.in
===================================================================
--- trunk/src/midend/programTransformation/constantFolding/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/programTransformation/constantFolding/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -179,7 +179,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -230,8 +229,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -249,8 +246,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -261,8 +256,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -291,13 +284,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -342,6 +331,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -365,8 +356,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -413,8 +402,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -456,14 +443,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -475,32 +462,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -566,6 +554,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -611,10 +600,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/programTransformation/finiteDifferencing/Makefile.in
===================================================================
--- trunk/src/midend/programTransformation/finiteDifferencing/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/programTransformation/finiteDifferencing/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -180,7 +180,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -231,8 +230,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -250,8 +247,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -262,8 +257,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -292,13 +285,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -343,6 +332,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -366,8 +357,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -414,8 +403,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -457,14 +444,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -476,32 +463,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -567,6 +555,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -612,10 +601,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/programTransformation/functionCallNormalization/Makefile.in
===================================================================
--- trunk/src/midend/programTransformation/functionCallNormalization/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/programTransformation/functionCallNormalization/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -180,7 +180,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -231,8 +230,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -250,8 +247,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -262,8 +257,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -292,13 +285,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -343,6 +332,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -366,8 +357,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -414,8 +403,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -457,14 +444,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -476,32 +463,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -567,6 +555,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -612,10 +601,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/programTransformation/implicitCodeGeneration/Makefile.in
===================================================================
--- trunk/src/midend/programTransformation/implicitCodeGeneration/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/programTransformation/implicitCodeGeneration/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -181,7 +181,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -232,8 +231,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -251,8 +248,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -263,8 +258,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -293,13 +286,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -344,6 +333,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -367,8 +358,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -415,8 +404,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -458,14 +445,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -477,32 +464,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -568,6 +556,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -613,10 +602,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/programTransformation/partialRedundancyElimination/Makefile.in
===================================================================
--- trunk/src/midend/programTransformation/partialRedundancyElimination/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/programTransformation/partialRedundancyElimination/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -93,7 +93,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -110,6 +109,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -180,7 +180,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -231,8 +230,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -250,8 +247,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -262,8 +257,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -292,13 +285,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -343,6 +332,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -366,8 +357,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -414,8 +403,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -457,14 +444,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -476,32 +463,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -567,6 +555,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -612,10 +601,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/midend/programTransformation/runtimeTransformation/Makefile.in
===================================================================
--- trunk/src/midend/programTransformation/runtimeTransformation/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/midend/programTransformation/runtimeTransformation/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -179,7 +179,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -230,8 +229,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -249,8 +246,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -261,8 +256,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -291,13 +284,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -342,6 +331,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -365,8 +356,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -413,8 +402,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -456,14 +443,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -475,32 +462,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -566,6 +554,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -611,10 +600,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/roseExtensions/Makefile.in
===================================================================
--- trunk/src/roseExtensions/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseExtensions/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -161,7 +161,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -212,8 +211,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -231,8 +228,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -243,8 +238,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -273,13 +266,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -324,6 +313,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -347,8 +338,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -395,8 +384,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -438,14 +425,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -457,32 +444,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -548,6 +536,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -593,10 +582,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/roseExtensions/SQLiteConnection/Makefile.in
===================================================================
--- trunk/src/roseExtensions/SQLiteConnection/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseExtensions/SQLiteConnection/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -93,7 +93,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -110,6 +109,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -188,7 +188,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -239,8 +238,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -258,8 +255,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -270,8 +265,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -300,13 +293,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -351,6 +340,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -374,8 +365,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -422,8 +411,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -465,14 +452,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -484,32 +471,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -575,6 +563,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -620,10 +609,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/roseExtensions/dataStructureTraversal/Makefile.in
===================================================================
--- trunk/src/roseExtensions/dataStructureTraversal/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseExtensions/dataStructureTraversal/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -165,7 +165,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -219,8 +218,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -238,8 +235,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -250,8 +245,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -280,13 +273,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -331,6 +320,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -354,8 +345,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -402,8 +391,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -445,14 +432,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -464,32 +451,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -555,6 +543,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -600,10 +589,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/roseExtensions/databaseConnection/Makefile.in
===================================================================
--- trunk/src/roseExtensions/databaseConnection/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseExtensions/databaseConnection/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -93,7 +93,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -110,6 +109,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -188,7 +188,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -239,8 +238,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -258,8 +255,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -270,8 +265,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -300,13 +293,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -351,6 +340,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -374,8 +365,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -422,8 +411,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -465,14 +452,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -484,32 +471,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -575,6 +563,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -620,10 +609,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/roseExtensions/highLevelGrammar/Makefile.in
===================================================================
--- trunk/src/roseExtensions/highLevelGrammar/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseExtensions/highLevelGrammar/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/roseExtensions/roseHPCToolkit/Makefile.in
===================================================================
--- trunk/src/roseExtensions/roseHPCToolkit/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseExtensions/roseHPCToolkit/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -62,7 +62,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -79,6 +78,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -134,7 +134,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -185,8 +184,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -204,8 +201,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -216,8 +211,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -246,13 +239,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -297,6 +286,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -320,8 +311,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -368,8 +357,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/src/roseExtensions/roseHPCToolkit/docs/Makefile.in
===================================================================
--- trunk/src/roseExtensions/roseHPCToolkit/docs/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseExtensions/roseHPCToolkit/docs/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -64,7 +64,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -81,6 +80,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -127,7 +127,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -178,8 +177,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -197,8 +194,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -209,8 +204,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -239,13 +232,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -290,6 +279,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -313,8 +304,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -361,8 +350,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/src/roseExtensions/roseHPCToolkit/include/Makefile.in
===================================================================
--- trunk/src/roseExtensions/roseHPCToolkit/include/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseExtensions/roseHPCToolkit/include/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -64,7 +64,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -81,6 +80,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -136,7 +136,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -187,8 +186,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -206,8 +203,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -218,8 +213,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -248,13 +241,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -299,6 +288,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -322,8 +313,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -370,8 +359,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/Makefile.in
===================================================================
--- trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -95,7 +95,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -112,6 +111,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -176,7 +176,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -227,8 +226,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -246,8 +243,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -258,8 +253,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -288,13 +281,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -339,6 +328,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -362,8 +353,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -410,8 +399,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -456,14 +443,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -475,32 +462,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -566,6 +554,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -611,10 +600,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/profir/Makefile.in
===================================================================
--- trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/profir/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/profir/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -95,7 +95,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -112,6 +111,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -169,7 +169,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -220,8 +219,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -239,8 +236,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -251,8 +246,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -281,13 +274,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -332,6 +321,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -355,8 +346,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -403,8 +392,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -446,14 +433,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -465,32 +452,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -556,6 +544,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -601,10 +590,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/profir2sage/Makefile.in
===================================================================
--- trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/profir2sage/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/profir2sage/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -95,7 +95,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -112,6 +111,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -169,7 +169,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -220,8 +219,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -239,8 +236,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -251,8 +246,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -281,13 +274,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -332,6 +321,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -355,8 +346,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -403,8 +392,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -446,14 +433,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -465,32 +452,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -556,6 +544,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -601,10 +590,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/sage/Makefile.in
===================================================================
--- trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/sage/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/sage/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -95,7 +95,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -112,6 +111,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -169,7 +169,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -220,8 +219,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -239,8 +236,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -251,8 +246,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -281,13 +274,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -332,6 +321,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -355,8 +346,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -403,8 +392,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -446,14 +433,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -465,32 +452,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -556,6 +544,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -601,10 +590,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/util/Makefile.in
===================================================================
--- trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/util/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/util/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -96,7 +96,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -113,6 +112,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -170,7 +170,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -221,8 +220,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -240,8 +237,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -252,8 +247,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -282,13 +275,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -333,6 +322,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -356,8 +347,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -404,8 +393,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -447,14 +434,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -466,32 +453,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -557,6 +545,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -602,10 +591,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/xml/Makefile.in
===================================================================
--- trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/xml/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/xml/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -96,7 +96,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -113,6 +112,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -170,7 +170,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -221,8 +220,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -240,8 +237,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -252,8 +247,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -282,13 +275,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -333,6 +322,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -356,8 +347,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -404,8 +393,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -447,14 +434,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -466,32 +453,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -557,6 +545,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -602,10 +591,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/xml-xercesc/Makefile.in
===================================================================
--- trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/xml-xercesc/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/xml-xercesc/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -96,7 +96,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -113,6 +112,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -170,7 +170,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -221,8 +220,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -240,8 +237,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -252,8 +247,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -282,13 +275,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -333,6 +322,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -356,8 +347,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -404,8 +393,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -447,14 +434,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -466,32 +453,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -557,6 +545,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -602,10 +591,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/xml2profir/Makefile.in
===================================================================
--- trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/xml2profir/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseExtensions/roseHPCToolkit/include/rosehpct/xml2profir/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -97,7 +97,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -114,6 +113,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -171,7 +171,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -222,8 +221,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -241,8 +238,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -253,8 +248,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -283,13 +276,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -334,6 +323,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -357,8 +348,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -405,8 +394,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -448,14 +435,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -467,32 +454,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -558,6 +546,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -603,10 +592,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/roseExtensions/roseHPCToolkit/src/Makefile.in
===================================================================
--- trunk/src/roseExtensions/roseHPCToolkit/src/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseExtensions/roseHPCToolkit/src/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -95,7 +95,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -112,6 +111,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -195,7 +195,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -246,8 +245,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -265,8 +262,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -277,8 +272,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -307,13 +300,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -358,6 +347,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -381,8 +372,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -429,8 +418,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -475,14 +462,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -494,32 +481,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -585,6 +573,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -630,10 +619,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/roseExtensions/roseHPCToolkit/src/profir/Makefile.in
===================================================================
--- trunk/src/roseExtensions/roseHPCToolkit/src/profir/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseExtensions/roseHPCToolkit/src/profir/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -95,7 +95,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -112,6 +111,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -174,7 +174,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -225,8 +224,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -244,8 +241,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -256,8 +251,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -286,13 +279,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -337,6 +326,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -360,8 +351,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -408,8 +397,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -451,14 +438,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -470,32 +457,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -561,6 +549,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -606,10 +595,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/roseExtensions/roseHPCToolkit/src/profir2sage/Makefile.in
===================================================================
--- trunk/src/roseExtensions/roseHPCToolkit/src/profir2sage/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseExtensions/roseHPCToolkit/src/profir2sage/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -95,7 +95,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -112,6 +111,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -174,7 +174,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -225,8 +224,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -244,8 +241,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -256,8 +251,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -286,13 +279,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -337,6 +326,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -360,8 +351,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -408,8 +397,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -451,14 +438,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -470,32 +457,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -561,6 +549,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -606,10 +595,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/roseExtensions/roseHPCToolkit/src/sage/Makefile.in
===================================================================
--- trunk/src/roseExtensions/roseHPCToolkit/src/sage/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseExtensions/roseHPCToolkit/src/sage/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -95,7 +95,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -112,6 +111,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -176,7 +176,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -227,8 +226,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -246,8 +243,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -258,8 +253,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -288,13 +281,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -339,6 +328,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -362,8 +353,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -410,8 +399,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -453,14 +440,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -472,32 +459,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -563,6 +551,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -608,10 +597,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/roseExtensions/roseHPCToolkit/src/util/Makefile.in
===================================================================
--- trunk/src/roseExtensions/roseHPCToolkit/src/util/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseExtensions/roseHPCToolkit/src/util/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -95,7 +95,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -112,6 +111,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -174,7 +174,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -225,8 +224,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -244,8 +241,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -256,8 +251,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -286,13 +279,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -337,6 +326,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -360,8 +351,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -408,8 +397,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -451,14 +438,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -470,32 +457,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -561,6 +549,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -606,10 +595,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/roseExtensions/roseHPCToolkit/src/xml/Makefile.in
===================================================================
--- trunk/src/roseExtensions/roseHPCToolkit/src/xml/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseExtensions/roseHPCToolkit/src/xml/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -95,7 +95,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -112,6 +111,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -175,7 +175,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -226,8 +225,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -245,8 +242,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -257,8 +252,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -287,13 +280,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -338,6 +327,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -361,8 +352,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -409,8 +398,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -452,14 +439,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -471,32 +458,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -562,6 +550,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -607,10 +596,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/roseExtensions/roseHPCToolkit/src/xml-xercesc/Makefile.in
===================================================================
--- trunk/src/roseExtensions/roseHPCToolkit/src/xml-xercesc/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseExtensions/roseHPCToolkit/src/xml-xercesc/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -94,7 +94,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -111,6 +110,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -157,7 +157,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -208,8 +207,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -227,8 +224,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -239,8 +234,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -269,13 +262,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -320,6 +309,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -343,8 +334,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -391,8 +380,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -434,14 +421,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -453,32 +440,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -544,6 +532,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -589,10 +578,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/roseExtensions/roseHPCToolkit/src/xml2profir/Makefile.in
===================================================================
--- trunk/src/roseExtensions/roseHPCToolkit/src/xml2profir/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseExtensions/roseHPCToolkit/src/xml2profir/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -95,7 +95,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -112,6 +111,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -176,7 +176,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -227,8 +226,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -246,8 +243,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -258,8 +253,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -288,13 +281,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -339,6 +328,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -362,8 +353,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -410,8 +399,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -453,14 +440,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -472,32 +459,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -563,6 +551,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -608,10 +597,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/roseExtensions/sqlite3x/Makefile.in
===================================================================
--- trunk/src/roseExtensions/sqlite3x/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseExtensions/sqlite3x/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -189,7 +189,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -240,8 +239,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -259,8 +256,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -271,8 +266,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -301,13 +294,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -352,6 +341,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -375,8 +366,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -423,8 +412,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -466,14 +453,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -485,32 +472,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -576,6 +564,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -621,10 +610,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/roseIndependentSupport/Makefile.am
===================================================================
--- trunk/src/roseIndependentSupport/Makefile.am 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseIndependentSupport/Makefile.am 2008-09-12 20:14:11 UTC (rev 32)
@@ -6,4 +6,5 @@
# The dot2gml is only compiled if the DOT_TO_GML_TRANSLATOR configure option is used
# The graphicalUserInterface is compiled only if the ROSE_USE_QROSE configure option is used
# SUBDIRS = graphicalUserInterface graphics visualization dot2gml
-SUBDIRS = graphicalUserInterface dot2gml
+# SUBDIRS = graphicalUserInterface dot2gml
+SUBDIRS = dot2gml
Modified: trunk/src/roseIndependentSupport/Makefile.in
===================================================================
--- trunk/src/roseIndependentSupport/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseIndependentSupport/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -161,7 +161,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -212,8 +211,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -231,8 +228,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -243,8 +238,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -273,13 +266,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -324,6 +313,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -347,8 +338,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -395,8 +384,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -438,14 +425,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -457,32 +444,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -548,6 +536,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -593,10 +582,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
@@ -613,7 +604,8 @@
# The dot2gml is only compiled if the DOT_TO_GML_TRANSLATOR configure option is used
# The graphicalUserInterface is compiled only if the ROSE_USE_QROSE configure option is used
# SUBDIRS = graphicalUserInterface graphics visualization dot2gml
-SUBDIRS = graphicalUserInterface dot2gml
+# SUBDIRS = graphicalUserInterface dot2gml
+SUBDIRS = dot2gml
all: all-recursive
.SUFFIXES:
Modified: trunk/src/roseIndependentSupport/dot2gml/Makefile.in
===================================================================
--- trunk/src/roseIndependentSupport/dot2gml/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseIndependentSupport/dot2gml/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -93,7 +93,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -110,6 +109,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -183,7 +183,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -234,8 +233,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -253,8 +250,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -265,8 +260,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -295,13 +288,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -346,6 +335,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -369,8 +360,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -417,8 +406,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -460,14 +447,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -479,32 +466,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -570,6 +558,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -615,10 +604,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/roseSupport/Makefile.in
===================================================================
--- trunk/src/roseSupport/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/roseSupport/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -181,7 +181,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -232,8 +231,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -251,8 +248,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -263,8 +258,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -293,13 +286,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -344,6 +333,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -367,8 +358,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -415,8 +404,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -458,14 +445,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -477,32 +464,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -568,6 +556,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -613,10 +602,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/util/Makefile.in
===================================================================
--- trunk/src/util/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/util/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -195,7 +195,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -246,8 +245,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -265,8 +262,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -277,8 +272,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -307,13 +300,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -358,6 +347,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -381,8 +372,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -429,8 +418,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -472,14 +459,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -491,32 +478,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -582,6 +570,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -627,10 +616,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/util/commandlineProcessing/Makefile.in
===================================================================
--- trunk/src/util/commandlineProcessing/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/util/commandlineProcessing/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -180,7 +180,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -231,8 +230,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -250,8 +247,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -262,8 +257,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -292,13 +285,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -343,6 +332,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -366,8 +357,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -414,8 +403,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -457,14 +444,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -476,32 +463,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -567,6 +555,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -612,10 +601,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/util/graphs/Makefile.in
===================================================================
--- trunk/src/util/graphs/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/util/graphs/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -180,7 +180,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -231,8 +230,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -250,8 +247,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -262,8 +257,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -292,13 +285,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -343,6 +332,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -366,8 +357,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -414,8 +403,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -457,14 +444,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -476,32 +463,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -567,6 +555,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -612,10 +601,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/util/stringSupport/Makefile.in
===================================================================
--- trunk/src/util/stringSupport/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/util/stringSupport/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -180,7 +180,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -231,8 +230,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -250,8 +247,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -262,8 +257,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -292,13 +285,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -343,6 +332,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -366,8 +357,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -414,8 +403,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -457,14 +444,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -476,32 +463,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -567,6 +555,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -612,10 +601,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/src/util/support/Makefile.in
===================================================================
--- trunk/src/util/support/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/src/util/support/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -180,7 +180,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -231,8 +230,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -250,8 +247,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -262,8 +257,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -292,13 +285,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -343,6 +332,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -366,8 +357,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -414,8 +403,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -457,14 +444,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -476,32 +463,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -567,6 +555,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -612,10 +601,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/A++Code/Makefile.in
===================================================================
--- trunk/tests/CompileTests/A++Code/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/A++Code/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/A++Tests/Makefile.in
===================================================================
--- trunk/tests/CompileTests/A++Tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/A++Tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/C99_tests/Makefile.in
===================================================================
--- trunk/tests/CompileTests/C99_tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/C99_tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -155,7 +155,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -206,8 +205,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -225,8 +222,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -237,8 +232,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -267,13 +260,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -318,6 +307,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -341,8 +332,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -389,8 +378,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -432,14 +419,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -451,32 +438,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -542,6 +530,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -587,10 +576,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/C_subset_of_Cxx_tests/Makefile.in
===================================================================
--- trunk/tests/CompileTests/C_subset_of_Cxx_tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/C_subset_of_Cxx_tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -155,7 +155,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -206,8 +205,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -225,8 +222,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -237,8 +232,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -267,13 +260,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -318,6 +307,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -341,8 +332,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -389,8 +378,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -432,14 +419,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -451,32 +438,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -542,6 +530,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -587,10 +576,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/C_tests/Makefile.in
===================================================================
--- trunk/tests/CompileTests/C_tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/C_tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -155,7 +155,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -206,8 +205,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -225,8 +222,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -237,8 +232,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -267,13 +260,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -318,6 +307,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -341,8 +332,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -389,8 +378,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -432,14 +419,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -451,32 +438,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -542,6 +530,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -587,10 +576,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/Cxx_tests/Makefile.in
===================================================================
--- trunk/tests/CompileTests/Cxx_tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/Cxx_tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -109,7 +109,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -126,6 +125,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -172,7 +172,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -223,8 +222,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -242,8 +239,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -254,8 +249,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -284,13 +277,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -335,6 +324,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -358,8 +349,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -406,8 +395,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -449,14 +436,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -468,32 +455,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -559,6 +547,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -604,10 +593,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/ElsaTestCases/Makefile.in
===================================================================
--- trunk/tests/CompileTests/ElsaTestCases/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/ElsaTestCases/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -161,7 +161,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -212,8 +211,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -231,8 +228,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -243,8 +238,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -273,13 +266,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -324,6 +313,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -347,8 +338,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -395,8 +384,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -438,14 +425,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -457,32 +444,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -548,6 +536,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -593,10 +582,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/ElsaTestCases/ctests/Makefile.in
===================================================================
--- trunk/tests/CompileTests/ElsaTestCases/ctests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/ElsaTestCases/ctests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/ElsaTestCases/gnu/Makefile.in
===================================================================
--- trunk/tests/CompileTests/ElsaTestCases/gnu/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/ElsaTestCases/gnu/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/ElsaTestCases/kandr/Makefile.in
===================================================================
--- trunk/tests/CompileTests/ElsaTestCases/kandr/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/ElsaTestCases/kandr/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/ElsaTestCases/std/Makefile.in
===================================================================
--- trunk/tests/CompileTests/ElsaTestCases/std/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/ElsaTestCases/std/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/ExpressionTemplateExample_tests/Makefile.in
===================================================================
--- trunk/tests/CompileTests/ExpressionTemplateExample_tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/ExpressionTemplateExample_tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -155,7 +155,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -206,8 +205,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -225,8 +222,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -237,8 +232,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -267,13 +260,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -318,6 +307,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -341,8 +332,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -389,8 +378,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -432,14 +419,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -451,32 +438,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -542,6 +530,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -587,10 +576,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/Fortran_tests/Makefile.in
===================================================================
--- trunk/tests/CompileTests/Fortran_tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/Fortran_tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -155,7 +155,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -206,8 +205,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -225,8 +222,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -237,8 +232,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -267,13 +260,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -318,6 +307,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -341,8 +332,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -389,8 +378,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -432,14 +419,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -451,32 +438,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -542,6 +530,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -587,10 +576,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/Makefile.in
===================================================================
--- trunk/tests/CompileTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -161,7 +161,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -212,8 +211,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -231,8 +228,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -243,8 +238,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -273,13 +266,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -324,6 +313,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -347,8 +338,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -395,8 +384,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -438,14 +425,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -457,32 +444,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -548,6 +536,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -593,10 +582,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/OpenMP_C_tests/Makefile.in
===================================================================
--- trunk/tests/CompileTests/OpenMP_C_tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/OpenMP_C_tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -155,7 +155,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -206,8 +205,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -225,8 +222,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -237,8 +232,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -267,13 +260,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -318,6 +307,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -341,8 +332,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -389,8 +378,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -432,14 +419,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -451,32 +438,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -542,6 +530,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -587,10 +576,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/OvertureCode/Makefile.in
===================================================================
--- trunk/tests/CompileTests/OvertureCode/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/OvertureCode/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -62,7 +62,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -79,6 +78,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -125,7 +125,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -176,8 +175,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -195,8 +192,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -207,8 +202,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -237,13 +230,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -288,6 +277,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -311,8 +302,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -359,8 +348,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/tests/CompileTests/P++Tests/Makefile.in
===================================================================
--- trunk/tests/CompileTests/P++Tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/P++Tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -64,7 +64,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -81,6 +80,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -127,7 +127,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -178,8 +177,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -197,8 +194,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -209,8 +204,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -239,13 +232,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -290,6 +279,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -313,8 +304,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -361,8 +350,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/tests/CompileTests/PythonExample_tests/Makefile.in
===================================================================
--- trunk/tests/CompileTests/PythonExample_tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/PythonExample_tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -155,7 +155,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -206,8 +205,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -225,8 +222,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -237,8 +232,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -267,13 +260,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -318,6 +307,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -341,8 +332,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -389,8 +378,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -432,14 +419,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -451,32 +438,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -542,6 +530,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -587,10 +576,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/RoseExample_tests/Makefile.in
===================================================================
--- trunk/tests/CompileTests/RoseExample_tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/RoseExample_tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -155,7 +155,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -206,8 +205,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -225,8 +222,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -237,8 +232,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -267,13 +260,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -318,6 +307,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -341,8 +332,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -389,8 +378,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -432,14 +419,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -451,32 +438,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -542,6 +530,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -587,10 +576,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/UPC_tests/Makefile.in
===================================================================
--- trunk/tests/CompileTests/UPC_tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/UPC_tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -155,7 +155,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -206,8 +205,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -225,8 +222,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -237,8 +232,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -267,13 +260,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -318,6 +307,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -341,8 +332,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -389,8 +378,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -432,14 +419,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -451,32 +438,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -542,6 +530,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -587,10 +576,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/boost_tests/Makefile.in
===================================================================
--- trunk/tests/CompileTests/boost_tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/boost_tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -155,7 +155,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -206,8 +205,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -225,8 +222,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -237,8 +232,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -267,13 +260,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -318,6 +307,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -341,8 +332,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -389,8 +378,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -432,14 +419,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -451,32 +438,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -542,6 +530,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -587,10 +576,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/colorAST_tests/Makefile.in
===================================================================
--- trunk/tests/CompileTests/colorAST_tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/colorAST_tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -94,7 +94,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -111,6 +110,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -135,7 +135,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -143,10 +144,11 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
testAstVisualization_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -195,7 +197,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -246,8 +247,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -265,8 +264,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -277,8 +274,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -307,13 +302,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -358,6 +349,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -381,8 +374,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -429,8 +420,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -472,14 +461,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -491,32 +480,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -582,6 +572,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -627,10 +618,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/copyAST_tests/Makefile.in
===================================================================
--- trunk/tests/CompileTests/copyAST_tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/copyAST_tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -133,7 +133,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -141,24 +142,25 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
-copyBlocks_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+copyBlocks_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
am_copyExample_OBJECTS = copyExample.$(OBJEXT)
copyExample_OBJECTS = $(am_copyExample_OBJECTS)
copyExample_LDADD = $(LDADD)
-copyExample_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+copyExample_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
am_copyFunctionDefinitions_OBJECTS = \
copyFunctionDefinitions.$(OBJEXT)
copyFunctionDefinitions_OBJECTS = \
$(am_copyFunctionDefinitions_OBJECTS)
copyFunctionDefinitions_LDADD = $(LDADD)
copyFunctionDefinitions_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_copyLoops_OBJECTS = copyLoops.$(OBJEXT)
copyLoops_OBJECTS = $(am_copyLoops_OBJECTS)
copyLoops_LDADD = $(LDADD)
-copyLoops_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+copyLoops_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -209,7 +211,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -260,8 +261,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -279,8 +278,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -291,8 +288,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -321,13 +316,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -372,6 +363,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -395,8 +388,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -443,8 +434,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -486,14 +475,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -505,32 +494,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -596,6 +586,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -641,10 +632,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/hiddenTypeAndDeclarationListTests/Makefile.in
===================================================================
--- trunk/tests/CompileTests/hiddenTypeAndDeclarationListTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/hiddenTypeAndDeclarationListTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -108,7 +108,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -125,6 +124,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -171,7 +171,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -222,8 +221,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -241,8 +238,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -253,8 +248,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -283,13 +276,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -334,6 +323,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -357,8 +348,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -405,8 +394,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -448,14 +435,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -467,32 +454,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -558,6 +546,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -603,10 +592,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/mergeAST_tests/Makefile.in
===================================================================
--- trunk/tests/CompileTests/mergeAST_tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/mergeAST_tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -94,7 +94,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -111,6 +110,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -135,7 +135,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -143,9 +144,10 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
-testMerge_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+testMerge_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -194,7 +196,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -245,8 +246,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -264,8 +263,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -276,8 +273,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -306,13 +301,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -357,6 +348,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -380,8 +373,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -428,8 +419,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -471,14 +460,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -490,32 +479,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -581,6 +571,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -626,10 +617,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/sourcePosition_tests/Makefile.in
===================================================================
--- trunk/tests/CompileTests/sourcePosition_tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/sourcePosition_tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -132,7 +132,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -140,9 +141,10 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
-statements_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+statements_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -191,7 +193,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -242,8 +243,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -261,8 +260,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -273,8 +270,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -303,13 +298,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -354,6 +345,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -377,8 +370,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -425,8 +416,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -468,14 +457,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -487,32 +476,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -578,6 +568,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -623,10 +614,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/uninitializedField_tests/Makefile.in
===================================================================
--- trunk/tests/CompileTests/uninitializedField_tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/uninitializedField_tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -110,7 +110,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -127,6 +126,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -154,7 +154,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -162,8 +163,9 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -212,7 +214,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -263,8 +264,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -282,8 +281,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -294,8 +291,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -324,13 +319,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -375,6 +366,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -398,8 +391,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -446,8 +437,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -489,14 +478,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -508,32 +497,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -599,6 +589,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -644,10 +635,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/unparseToString_tests/Makefile.in
===================================================================
--- trunk/tests/CompileTests/unparseToString_tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/unparseToString_tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -95,7 +95,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -112,6 +111,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -136,7 +136,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -144,15 +145,16 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
unparseToString_All_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_unparseToString_Type_OBJECTS = unparseToString_Type.$(OBJEXT)
unparseToString_Type_OBJECTS = $(am_unparseToString_Type_OBJECTS)
unparseToString_Type_LDADD = $(LDADD)
unparseToString_Type_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -203,7 +205,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -254,8 +255,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -273,8 +272,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -285,8 +282,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -315,13 +310,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -366,6 +357,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -389,8 +382,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -437,8 +428,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -480,14 +469,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -499,32 +488,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -590,6 +580,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -635,10 +626,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompileTests/virtualCFG_tests/Makefile.in
===================================================================
--- trunk/tests/CompileTests/virtualCFG_tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompileTests/virtualCFG_tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -110,7 +110,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -127,6 +126,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -151,7 +151,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -159,10 +160,11 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
testVirtualCFG_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -211,7 +213,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -262,8 +263,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -281,8 +280,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -293,8 +290,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -323,13 +318,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -374,6 +365,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -397,8 +390,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -445,8 +436,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -488,14 +477,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -507,32 +496,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -598,6 +588,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -643,10 +634,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompilerOptionsTests/Makefile.in
===================================================================
--- trunk/tests/CompilerOptionsTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompilerOptionsTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -161,7 +161,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -212,8 +211,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -231,8 +228,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -243,8 +238,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -273,13 +266,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -324,6 +313,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -347,8 +338,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -395,8 +384,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -438,14 +425,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -457,32 +444,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -548,6 +536,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -593,10 +582,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompilerOptionsTests/testCpreprocessorOption/Makefile.in
===================================================================
--- trunk/tests/CompilerOptionsTests/testCpreprocessorOption/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompilerOptionsTests/testCpreprocessorOption/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompilerOptionsTests/testFileNamesAndExtensions/Makefile.in
===================================================================
--- trunk/tests/CompilerOptionsTests/testFileNamesAndExtensions/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompilerOptionsTests/testFileNamesAndExtensions/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -161,7 +161,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -212,8 +211,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -231,8 +228,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -243,8 +238,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -273,13 +266,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -324,6 +313,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -347,8 +338,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -395,8 +384,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -438,14 +425,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -457,32 +444,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -548,6 +536,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -593,10 +582,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/Makefile.in
===================================================================
--- trunk/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -62,7 +62,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -79,6 +78,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -134,7 +134,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -185,8 +184,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -204,8 +201,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -216,8 +211,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -246,13 +239,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -297,6 +286,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -320,8 +311,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -368,8 +357,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseInsensitive/Makefile.in
===================================================================
--- trunk/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseInsensitive/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseInsensitive/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseSensitive/Makefile.in
===================================================================
--- trunk/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseSensitive/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileExtensions/caseSensitive/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileNames/Makefile.in
===================================================================
--- trunk/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileNames/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompilerOptionsTests/testFileNamesAndExtensions/fileNames/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompilerOptionsTests/testForSpuriousOutput/Makefile.in
===================================================================
--- trunk/tests/CompilerOptionsTests/testForSpuriousOutput/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompilerOptionsTests/testForSpuriousOutput/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompilerOptionsTests/testHeaderFileOutput/Makefile.in
===================================================================
--- trunk/tests/CompilerOptionsTests/testHeaderFileOutput/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompilerOptionsTests/testHeaderFileOutput/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/CompilerOptionsTests/testOutputFileOption/Makefile.in
===================================================================
--- trunk/tests/CompilerOptionsTests/testOutputFileOption/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/CompilerOptionsTests/testOutputFileOption/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/Makefile.in
===================================================================
--- trunk/tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -132,7 +132,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -140,9 +141,10 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
testTranslator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -198,7 +200,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -249,8 +250,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -268,8 +267,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -280,8 +277,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -310,13 +305,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -361,6 +352,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -384,8 +377,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -432,8 +423,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -475,14 +464,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -494,32 +483,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -585,6 +575,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -630,10 +621,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/PerformanceTests/Makefile.in
===================================================================
--- trunk/tests/PerformanceTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/PerformanceTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -152,7 +152,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -203,8 +202,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -222,8 +219,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -234,8 +229,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -264,13 +257,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -315,6 +304,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -338,8 +329,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -386,8 +375,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -429,14 +416,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -448,32 +435,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -539,6 +527,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -584,10 +573,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/RunTests/A++Tests/Makefile.in
===================================================================
--- trunk/tests/RunTests/A++Tests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/RunTests/A++Tests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -62,7 +62,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -79,6 +78,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -125,7 +125,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -176,8 +175,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -195,8 +192,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -207,8 +202,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -237,13 +230,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -288,6 +277,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -311,8 +302,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -359,8 +348,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/tests/RunTests/Makefile.in
===================================================================
--- trunk/tests/RunTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/RunTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -161,7 +161,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -212,8 +211,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -231,8 +228,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -243,8 +238,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -273,13 +266,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -324,6 +313,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -347,8 +338,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -395,8 +384,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -438,14 +425,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -457,32 +444,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -548,6 +536,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -593,10 +582,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/roseTests/Makefile.in
===================================================================
--- trunk/tests/roseTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -89,7 +89,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -106,6 +105,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -161,7 +161,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -212,8 +211,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -231,8 +228,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -243,8 +238,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -273,13 +266,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -324,6 +313,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -347,8 +338,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -395,8 +384,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -438,14 +425,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -457,32 +444,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -548,6 +536,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -593,10 +582,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/roseTests/PHPTests/Makefile.in
===================================================================
--- trunk/tests/roseTests/PHPTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/PHPTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -131,7 +131,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -139,9 +140,10 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
-runTest_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+runTest_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -190,7 +192,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -241,8 +242,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -260,8 +259,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -272,8 +269,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -302,13 +297,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -353,6 +344,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -376,8 +369,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -424,8 +415,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -467,14 +456,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -486,32 +475,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -577,6 +567,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -622,10 +613,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/roseTests/astFileIOTests/Makefile.in
===================================================================
--- trunk/tests/roseTests/astFileIOTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/astFileIOTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -132,7 +132,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -140,16 +141,17 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
astCompressionTest_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_astFileIO_OBJECTS = astFileIO.$(OBJEXT)
astFileIO_OBJECTS = $(am_astFileIO_OBJECTS)
-astFileIO_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+astFileIO_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
am_astFileRead_OBJECTS = astFileRead.$(OBJEXT)
astFileRead_OBJECTS = $(am_astFileRead_OBJECTS)
-astFileRead_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+astFileRead_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -200,7 +202,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -251,8 +252,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -270,8 +269,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -282,8 +279,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -312,13 +307,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -363,6 +354,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -386,8 +379,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -434,8 +425,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -477,14 +466,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -496,32 +485,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -587,6 +577,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -632,10 +623,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/roseTests/astInliningTests/Makefile.in
===================================================================
--- trunk/tests/roseTests/astInliningTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/astInliningTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -131,7 +131,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -139,10 +140,11 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
inlineEverything_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -191,7 +193,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -242,8 +243,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -261,8 +260,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -273,8 +270,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -303,13 +298,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -354,6 +345,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -377,8 +370,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -425,8 +416,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -468,14 +457,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -487,32 +476,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -578,6 +568,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -623,10 +614,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/roseTests/astInterfaceTests/Makefile.in
===================================================================
--- trunk/tests/roseTests/astInterfaceTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/astInterfaceTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -104,7 +104,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -121,6 +120,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -143,7 +143,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -151,117 +152,118 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-abiStuffTest_DEPENDENCIES = $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+abiStuffTest_DEPENDENCIES = $(am__DEPENDENCIES_7)
am_abiStuffTestUPC_OBJECTS = abiStuffTestUPC.$(OBJEXT)
abiStuffTestUPC_OBJECTS = $(am_abiStuffTestUPC_OBJECTS)
abiStuffTestUPC_LDADD = $(LDADD)
-abiStuffTestUPC_DEPENDENCIES = $(am__DEPENDENCIES_6)
+abiStuffTestUPC_DEPENDENCIES = $(am__DEPENDENCIES_7)
am_attachComment_OBJECTS = attachComment.$(OBJEXT)
attachComment_OBJECTS = $(am_attachComment_OBJECTS)
attachComment_LDADD = $(LDADD)
-attachComment_DEPENDENCIES = $(am__DEPENDENCIES_6)
+attachComment_DEPENDENCIES = $(am__DEPENDENCIES_7)
am_buildAssignmentStmt_OBJECTS = buildAssignmentStmt.$(OBJEXT)
buildAssignmentStmt_OBJECTS = $(am_buildAssignmentStmt_OBJECTS)
buildAssignmentStmt_LDADD = $(LDADD)
-buildAssignmentStmt_DEPENDENCIES = $(am__DEPENDENCIES_6)
+buildAssignmentStmt_DEPENDENCIES = $(am__DEPENDENCIES_7)
am_buildCpreprocessorDefineDeclaration_OBJECTS = \
buildCpreprocessorDefineDeclaration.$(OBJEXT)
buildCpreprocessorDefineDeclaration_OBJECTS = \
$(am_buildCpreprocessorDefineDeclaration_OBJECTS)
buildCpreprocessorDefineDeclaration_LDADD = $(LDADD)
buildCpreprocessorDefineDeclaration_DEPENDENCIES = \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
am_buildExpression_OBJECTS = buildExpression.$(OBJEXT)
buildExpression_OBJECTS = $(am_buildExpression_OBJECTS)
buildExpression_LDADD = $(LDADD)
-buildExpression_DEPENDENCIES = $(am__DEPENDENCIES_6)
+buildExpression_DEPENDENCIES = $(am__DEPENDENCIES_7)
am_buildFile_OBJECTS = buildFile.$(OBJEXT)
buildFile_OBJECTS = $(am_buildFile_OBJECTS)
buildFile_LDADD = $(LDADD)
-buildFile_DEPENDENCIES = $(am__DEPENDENCIES_6)
+buildFile_DEPENDENCIES = $(am__DEPENDENCIES_7)
am_buildForStmt_OBJECTS = buildForStmt.$(OBJEXT)
buildForStmt_OBJECTS = $(am_buildForStmt_OBJECTS)
buildForStmt_LDADD = $(LDADD)
-buildForStmt_DEPENDENCIES = $(am__DEPENDENCIES_6)
+buildForStmt_DEPENDENCIES = $(am__DEPENDENCIES_7)
am_buildFunctionCalls_OBJECTS = buildFunctionCalls.$(OBJEXT)
buildFunctionCalls_OBJECTS = $(am_buildFunctionCalls_OBJECTS)
buildFunctionCalls_LDADD = $(LDADD)
-buildFunctionCalls_DEPENDENCIES = $(am__DEPENDENCIES_6)
+buildFunctionCalls_DEPENDENCIES = $(am__DEPENDENCIES_7)
am_buildFunctionDeclaration_OBJECTS = \
buildFunctionDeclaration.$(OBJEXT)
buildFunctionDeclaration_OBJECTS = \
$(am_buildFunctionDeclaration_OBJECTS)
buildFunctionDeclaration_LDADD = $(LDADD)
-buildFunctionDeclaration_DEPENDENCIES = $(am__DEPENDENCIES_6)
+buildFunctionDeclaration_DEPENDENCIES = $(am__DEPENDENCIES_7)
am_buildIfStmt_OBJECTS = buildIfStmt.$(OBJEXT)
buildIfStmt_OBJECTS = $(am_buildIfStmt_OBJECTS)
buildIfStmt_LDADD = $(LDADD)
-buildIfStmt_DEPENDENCIES = $(am__DEPENDENCIES_6)
+buildIfStmt_DEPENDENCIES = $(am__DEPENDENCIES_7)
am_buildLabelStatement_OBJECTS = buildLabelStatement.$(OBJEXT)
buildLabelStatement_OBJECTS = $(am_buildLabelStatement_OBJECTS)
buildLabelStatement_LDADD = $(LDADD)
-buildLabelStatement_DEPENDENCIES = $(am__DEPENDENCIES_6)
+buildLabelStatement_DEPENDENCIES = $(am__DEPENDENCIES_7)
am_buildNondefiningFunction_OBJECTS = \
buildNondefiningFunction.$(OBJEXT)
buildNondefiningFunction_OBJECTS = \
$(am_buildNondefiningFunction_OBJECTS)
buildNondefiningFunction_LDADD = $(LDADD)
-buildNondefiningFunction_DEPENDENCIES = $(am__DEPENDENCIES_6)
+buildNondefiningFunction_DEPENDENCIES = $(am__DEPENDENCIES_7)
am_buildNullStatement_OBJECTS = buildNullStatement.$(OBJEXT)
buildNullStatement_OBJECTS = $(am_buildNullStatement_OBJECTS)
buildNullStatement_LDADD = $(LDADD)
-buildNullStatement_DEPENDENCIES = $(am__DEPENDENCIES_6)
+buildNullStatement_DEPENDENCIES = $(am__DEPENDENCIES_7)
am_buildPragmaDeclaration_OBJECTS = buildPragmaDeclaration.$(OBJEXT)
buildPragmaDeclaration_OBJECTS = $(am_buildPragmaDeclaration_OBJECTS)
buildPragmaDeclaration_LDADD = $(LDADD)
-buildPragmaDeclaration_DEPENDENCIES = $(am__DEPENDENCIES_6)
+buildPragmaDeclaration_DEPENDENCIES = $(am__DEPENDENCIES_7)
am_buildSizeOfOp_OBJECTS = buildSizeOfOp.$(OBJEXT)
buildSizeOfOp_OBJECTS = $(am_buildSizeOfOp_OBJECTS)
buildSizeOfOp_LDADD = $(LDADD)
-buildSizeOfOp_DEPENDENCIES = $(am__DEPENDENCIES_6)
+buildSizeOfOp_DEPENDENCIES = $(am__DEPENDENCIES_7)
am_buildStructDeclaration_OBJECTS = buildStructDeclaration.$(OBJEXT)
buildStructDeclaration_OBJECTS = $(am_buildStructDeclaration_OBJECTS)
buildStructDeclaration_LDADD = $(LDADD)
-buildStructDeclaration_DEPENDENCIES = $(am__DEPENDENCIES_6)
+buildStructDeclaration_DEPENDENCIES = $(am__DEPENDENCIES_7)
am_buildVariableDeclaration_OBJECTS = \
buildVariableDeclaration.$(OBJEXT)
buildVariableDeclaration_OBJECTS = \
$(am_buildVariableDeclaration_OBJECTS)
buildVariableDeclaration_LDADD = $(LDADD)
-buildVariableDeclaration_DEPENDENCIES = $(am__DEPENDENCIES_6)
+buildVariableDeclaration_DEPENDENCIES = $(am__DEPENDENCIES_7)
am_findMain_OBJECTS = findMain.$(OBJEXT)
findMain_OBJECTS = $(am_findMain_OBJECTS)
findMain_LDADD = $(LDADD)
-findMain_DEPENDENCIES = $(am__DEPENDENCIES_6)
+findMain_DEPENDENCIES = $(am__DEPENDENCIES_7)
am_insertHeader_OBJECTS = insertHeader.$(OBJEXT)
insertHeader_OBJECTS = $(am_insertHeader_OBJECTS)
insertHeader_LDADD = $(LDADD)
-insertHeader_DEPENDENCIES = $(am__DEPENDENCIES_6)
+insertHeader_DEPENDENCIES = $(am__DEPENDENCIES_7)
am_instrumentEndOfFunction_OBJECTS = \
instrumentEndOfFunction.$(OBJEXT)
instrumentEndOfFunction_OBJECTS = \
$(am_instrumentEndOfFunction_OBJECTS)
instrumentEndOfFunction_LDADD = $(LDADD)
-instrumentEndOfFunction_DEPENDENCIES = $(am__DEPENDENCIES_6)
+instrumentEndOfFunction_DEPENDENCIES = $(am__DEPENDENCIES_7)
am_isUpcPhaseLessSharedType_OBJECTS = \
isUpcPhaseLessSharedType.$(OBJEXT)
isUpcPhaseLessSharedType_OBJECTS = \
$(am_isUpcPhaseLessSharedType_OBJECTS)
isUpcPhaseLessSharedType_LDADD = $(LDADD)
-isUpcPhaseLessSharedType_DEPENDENCIES = $(am__DEPENDENCIES_6)
+isUpcPhaseLessSharedType_DEPENDENCIES = $(am__DEPENDENCIES_7)
am_isUpcSharedType_OBJECTS = isUpcSharedType.$(OBJEXT)
isUpcSharedType_OBJECTS = $(am_isUpcSharedType_OBJECTS)
isUpcSharedType_LDADD = $(LDADD)
-isUpcSharedType_DEPENDENCIES = $(am__DEPENDENCIES_6)
+isUpcSharedType_DEPENDENCIES = $(am__DEPENDENCIES_7)
am_lookupNamedType_OBJECTS = lookupNamedType.$(OBJEXT)
lookupNamedType_OBJECTS = $(am_lookupNamedType_OBJECTS)
lookupNamedType_LDADD = $(LDADD)
-lookupNamedType_DEPENDENCIES = $(am__DEPENDENCIES_6)
+lookupNamedType_DEPENDENCIES = $(am__DEPENDENCIES_7)
am_movePreprocessingInfo_OBJECTS = movePreprocessingInfo.$(OBJEXT)
movePreprocessingInfo_OBJECTS = $(am_movePreprocessingInfo_OBJECTS)
movePreprocessingInfo_LDADD = $(LDADD)
-movePreprocessingInfo_DEPENDENCIES = $(am__DEPENDENCIES_6)
+movePreprocessingInfo_DEPENDENCIES = $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -338,7 +340,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -389,8 +390,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -408,8 +407,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -420,8 +417,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -450,13 +445,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -501,6 +492,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -524,8 +517,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -572,8 +563,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -615,14 +604,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -634,32 +623,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -725,6 +715,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -770,10 +761,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/roseTests/astMergeTests/Makefile.in
===================================================================
--- trunk/tests/roseTests/astMergeTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/astMergeTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -131,7 +131,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -139,10 +140,11 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
-testMerge_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
+testMerge_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -191,7 +193,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -243,8 +244,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -262,8 +261,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -274,8 +271,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -304,13 +299,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -355,6 +346,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -378,8 +371,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -426,8 +417,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -469,14 +458,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -488,32 +477,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -579,6 +569,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -624,10 +615,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/roseTests/astOutliningTests/Makefile.am
===================================================================
--- trunk/tests/roseTests/astOutliningTests/Makefile.am 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/astOutliningTests/Makefile.am 2008-09-12 20:14:11 UTC (rev 32)
@@ -26,8 +26,9 @@
# INCLUDES += -I.
+# We install a standalone outliner to be installed with ROSE
+bin_PROGRAMS = outline
noinst_PROGRAMS = \
- outline \
injectOutlinePragmas \
outlineRandom \
outlineSelection
@@ -61,13 +62,17 @@
OUTLINER_BIN = ./outlineSelection$(EXEEXT)
TEST_CXXFLAGS = $(TEST_INCLUDES) -rose:verbose 2 -rose:outline:seq 7
+# Additional test, Liao, 9/11/2008
+rose_moreTest1.c:outline
+ ./outline$(EXEEXT) -c $(srcdir)/moreTest1.c
-EXTRA_DIST = build_tests-1pass.sh RandomStmtSelector.hh
+EXTRA_DIST = build_tests-1pass.sh RandomStmtSelector.hh moreTest1.c
CLEANFILES = Makefile-1pass LIST.dat
# DQ (8/29/2008): Added dependences
check-local: outline injectOutlinePragmas outlineRandom outlineSelection
@echo "Test for ROSE outliner."
+ $(MAKE) rose_moreTest1.c
$(MAKE) one-pass
test -f Makefile-1pass
$(MAKE) -f Makefile-1pass \
Modified: trunk/tests/roseTests/astOutliningTests/Makefile.in
===================================================================
--- trunk/tests/roseTests/astOutliningTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/astOutliningTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -64,8 +64,9 @@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/config/Makefile.for.ROSE.includes.and.libs
-noinst_PROGRAMS = outline$(EXEEXT) injectOutlinePragmas$(EXEEXT) \
- outlineRandom$(EXEEXT) outlineSelection$(EXEEXT)
+bin_PROGRAMS = outline$(EXEEXT)
+noinst_PROGRAMS = injectOutlinePragmas$(EXEEXT) outlineRandom$(EXEEXT) \
+ outlineSelection$(EXEEXT)
subdir = tests/roseTests/astOutliningTests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = \
@@ -92,7 +93,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +109,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -117,7 +118,9 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/rose_config.h
CONFIG_CLEAN_FILES =
-PROGRAMS = $(noinst_PROGRAMS)
+am__installdirs = "$(DESTDIR)$(bindir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am_injectOutlinePragmas_OBJECTS = RandomStmtSelector.$(OBJEXT) \
injectOutlinePragmas.$(OBJEXT)
injectOutlinePragmas_OBJECTS = $(am_injectOutlinePragmas_OBJECTS)
@@ -189,7 +192,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -240,8 +242,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -259,8 +259,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -271,8 +269,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -301,13 +297,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -352,6 +344,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -375,8 +369,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -423,8 +415,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -470,14 +460,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -489,32 +479,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -580,6 +571,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -625,10 +617,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
@@ -677,7 +671,7 @@
# Outliner utility and flags to run with the tests.
OUTLINER_BIN = ./outlineSelection$(EXEEXT)
TEST_CXXFLAGS = $(TEST_INCLUDES) -rose:verbose 2 -rose:outline:seq 7
-EXTRA_DIST = build_tests-1pass.sh RandomStmtSelector.hh
+EXTRA_DIST = build_tests-1pass.sh RandomStmtSelector.hh moreTest1.c
CLEANFILES = Makefile-1pass LIST.dat
all: all-recursive
@@ -712,7 +706,35 @@
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)
+ 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" || exit 1; \
+ else :; fi; \
+ done
+uninstall-binPROGRAMS:
+ @$(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"; \
+ done
+
+clean-binPROGRAMS:
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f $$p $$f"; \
+ rm -f $$p $$f ; \
+ done
+
clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; for p in $$list; do \
f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
@@ -938,6 +960,9 @@
all-am: Makefile $(PROGRAMS)
installdirs: installdirs-recursive
installdirs-am:
+ 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
@@ -965,8 +990,8 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-recursive
-clean-am: clean-generic clean-libtool clean-local clean-noinstPROGRAMS \
- mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \
+ clean-noinstPROGRAMS mostlyclean-am
distclean: distclean-recursive
-rm -f Makefile
@@ -985,7 +1010,7 @@
install-data-am:
-install-exec-am:
+install-exec-am: install-binPROGRAMS
install-info: install-info-recursive
@@ -1010,24 +1035,25 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- check-local clean clean-generic clean-libtool clean-local \
- clean-noinstPROGRAMS 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-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-info-am
+ check-local clean clean-binPROGRAMS clean-generic \
+ clean-libtool clean-local clean-noinstPROGRAMS 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
# JJW (2/25/2008): set a flag (only used when running ROSE applications) to
@@ -1054,9 +1080,14 @@
# Import a list of C++ test codes expected to pass.
include $(TEST_DIR)/Makefile-pass.inc
+# Additional test, Liao, 9/11/2008
+rose_moreTest1.c:outline
+ ./outline$(EXEEXT) -c $(srcdir)/moreTest1.c
+
# DQ (8/29/2008): Added dependences
check-local: outline injectOutlinePragmas outlineRandom outlineSelection
@echo "Test for ROSE outliner."
+ $(MAKE) rose_moreTest1.c
$(MAKE) one-pass
test -f Makefile-1pass
$(MAKE) -f Makefile-1pass \
Modified: trunk/tests/roseTests/astOutliningTests/fortranTests/Makefile.in
===================================================================
--- trunk/tests/roseTests/astOutliningTests/fortranTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/astOutliningTests/fortranTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -155,7 +155,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -206,8 +205,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -225,8 +222,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -237,8 +232,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -267,13 +260,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -318,6 +307,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -341,8 +332,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -389,8 +378,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -432,14 +419,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -451,32 +438,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -542,6 +530,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -587,10 +576,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Added: trunk/tests/roseTests/astOutliningTests/moreTest1.c
===================================================================
--- trunk/tests/roseTests/astOutliningTests/moreTest1.c (rev 0)
+++ trunk/tests/roseTests/astOutliningTests/moreTest1.c 2008-09-12 20:14:11 UTC (rev 32)
@@ -0,0 +1,14 @@
+/* This code tests two things:
+ * 1) for c code, extern "C" should not be inserted
+ * 2) the bug: int &a = *ap__;
+ */
+void foo()
+{
+ int i,sum=0;
+#pragma rose_outline
+ for (i=0;i<100;i++)
+ {
+ sum +=i;
+ }
+}
+
Property changes on: trunk/tests/roseTests/astOutliningTests/moreTest1.c
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/tests/roseTests/astOutliningTests/outline.cc
===================================================================
--- trunk/tests/roseTests/astOutliningTests/outline.cc 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/astOutliningTests/outline.cc 2008-09-12 20:14:11 UTC (rev 32)
@@ -1,5 +1,5 @@
/*!
- * \file liaoutliner.cc
+ * \file outline.cc
*
* \brief Demonstrates the pragma-interface of the Outliner.
*
Modified: trunk/tests/roseTests/astPerformanceTests/Makefile.in
===================================================================
--- trunk/tests/roseTests/astPerformanceTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/astPerformanceTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -131,7 +131,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -139,15 +140,16 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
rosePerformanceTest_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_testPerformance_OBJECTS = testPerformance.$(OBJEXT)
testPerformance_OBJECTS = $(am_testPerformance_OBJECTS)
testPerformance_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -197,7 +199,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -248,8 +249,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -267,8 +266,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -279,8 +276,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -309,13 +304,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -360,6 +351,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -383,8 +376,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -431,8 +422,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -474,14 +463,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -493,32 +482,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -584,6 +574,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -629,10 +620,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/roseTests/astProcessingTests/Makefile.in
===================================================================
--- trunk/tests/roseTests/astProcessingTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/astProcessingTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -131,7 +131,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -139,11 +140,12 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
astTraversalTest_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -192,7 +194,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -243,8 +244,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -262,8 +261,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -274,8 +271,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -304,13 +299,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -355,6 +346,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -378,8 +371,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -426,8 +417,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -469,14 +458,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -488,32 +477,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -579,6 +569,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -624,10 +615,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/roseTests/astQueryTests/Makefile.in
===================================================================
--- trunk/tests/roseTests/astQueryTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/astQueryTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -132,7 +132,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -140,16 +141,17 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
-testQuery_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
+testQuery_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
am_testQuery2_OBJECTS = testQuery2.$(OBJEXT)
testQuery2_OBJECTS = $(am_testQuery2_OBJECTS)
-testQuery2_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+testQuery2_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
am_testQuery3_OBJECTS = testQuery3.$(OBJEXT)
testQuery3_OBJECTS = $(am_testQuery3_OBJECTS)
-testQuery3_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+testQuery3_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -200,7 +202,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -251,8 +252,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -270,8 +269,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -282,8 +279,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -312,13 +307,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -363,6 +354,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -386,8 +379,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -434,8 +425,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -477,14 +466,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -496,32 +485,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -587,6 +577,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -632,10 +623,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/roseTests/astRewriteTests/Makefile.in
===================================================================
--- trunk/tests/roseTests/astRewriteTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/astRewriteTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -101,7 +101,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -118,6 +117,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -142,7 +142,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -150,53 +151,54 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
tauifyPreprocessor_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_testCommentInsertion_OBJECTS = testCommentInsertion.$(OBJEXT)
testCommentInsertion_OBJECTS = $(am_testCommentInsertion_OBJECTS)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
-testCommentInsertion_DEPENDENCIES = $(am__DEPENDENCIES_8)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+testCommentInsertion_DEPENDENCIES = $(am__DEPENDENCIES_9)
am_testDeclarationPrefixGeneration_OBJECTS = \
testDeclarationPrefixGeneration.$(OBJEXT)
testDeclarationPrefixGeneration_OBJECTS = \
$(am_testDeclarationPrefixGeneration_OBJECTS)
-testDeclarationPrefixGeneration_DEPENDENCIES = $(am__DEPENDENCIES_8)
+testDeclarationPrefixGeneration_DEPENDENCIES = $(am__DEPENDENCIES_9)
am_testExample1_OBJECTS = testExample1.$(OBJEXT)
testExample1_OBJECTS = $(am_testExample1_OBJECTS)
-testExample1_DEPENDENCIES = $(am__DEPENDENCIES_8)
+testExample1_DEPENDENCIES = $(am__DEPENDENCIES_9)
am_testIncludeDirectiveInsertion_OBJECTS = \
testIncludeDirectiveInsertion.$(OBJEXT)
testIncludeDirectiveInsertion_OBJECTS = \
$(am_testIncludeDirectiveInsertion_OBJECTS)
-testIncludeDirectiveInsertion_DEPENDENCIES = $(am__DEPENDENCIES_8)
+testIncludeDirectiveInsertion_DEPENDENCIES = $(am__DEPENDENCIES_9)
am_testMidLevelInterface_OBJECTS = testMidLevelInterface.$(OBJEXT)
testMidLevelInterface_OBJECTS = $(am_testMidLevelInterface_OBJECTS)
-testMidLevelInterface_DEPENDENCIES = $(am__DEPENDENCIES_8)
+testMidLevelInterface_DEPENDENCIES = $(am__DEPENDENCIES_9)
am_testRemoveStatements_OBJECTS = testRemoveStatements.$(OBJEXT)
testRemoveStatements_OBJECTS = $(am_testRemoveStatements_OBJECTS)
-testRemoveStatements_DEPENDENCIES = $(am__DEPENDENCIES_8)
+testRemoveStatements_DEPENDENCIES = $(am__DEPENDENCIES_9)
am_testReplacementStatements_OBJECTS = \
testReplacementStatements.$(OBJEXT)
testReplacementStatements_OBJECTS = \
$(am_testReplacementStatements_OBJECTS)
-testReplacementStatements_DEPENDENCIES = $(am__DEPENDENCIES_8)
+testReplacementStatements_DEPENDENCIES = $(am__DEPENDENCIES_9)
am_testRewritePermutations_OBJECTS = testNewRewrite.$(OBJEXT) \
testRewritePermutations.$(OBJEXT)
testRewritePermutations_OBJECTS = \
$(am_testRewritePermutations_OBJECTS)
-testRewritePermutations_DEPENDENCIES = $(am__DEPENDENCIES_8)
+testRewritePermutations_DEPENDENCIES = $(am__DEPENDENCIES_9)
am_testRewriteReplacementPermutations_OBJECTS = \
testNewRewrite.$(OBJEXT) \
testRewriteReplacementPermutations.$(OBJEXT)
testRewriteReplacementPermutations_OBJECTS = \
$(am_testRewriteReplacementPermutations_OBJECTS)
testRewriteReplacementPermutations_DEPENDENCIES = \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
am_testTranslator2004_01_OBJECTS = testTranslator2004_01.$(OBJEXT)
testTranslator2004_01_OBJECTS = $(am_testTranslator2004_01_OBJECTS)
-testTranslator2004_01_DEPENDENCIES = $(am__DEPENDENCIES_8)
+testTranslator2004_01_DEPENDENCIES = $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -273,7 +275,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -324,8 +325,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -343,8 +342,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -355,8 +352,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -385,13 +380,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -436,6 +427,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -459,8 +452,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -507,8 +498,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -550,14 +539,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -569,32 +558,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -660,6 +650,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -705,10 +696,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/roseTests/astSymbolTableTests/Makefile.in
===================================================================
--- trunk/tests/roseTests/astSymbolTableTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/astSymbolTableTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -131,7 +131,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -139,11 +140,12 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_8)
testSymbolTable_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -192,7 +194,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -243,8 +244,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -262,8 +261,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -274,8 +271,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -304,13 +299,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -355,6 +346,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -378,8 +371,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -426,8 +417,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -469,14 +458,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -488,32 +477,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -579,6 +569,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -624,10 +615,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/roseTests/binaryTests/Makefile.in
===================================================================
--- trunk/tests/roseTests/binaryTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/binaryTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -133,7 +133,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -141,11 +142,12 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
@USE_BINARY_ANALYSIS_TESTS_TRUE at runTest_DEPENDENCIES = \
@USE_BINARY_ANALYSIS_TESTS_TRUE@ $(am__DEPENDENCIES_1) \
- at USE_BINARY_ANALYSIS_TESTS_TRUE@ $(am__DEPENDENCIES_7)
+ at USE_BINARY_ANALYSIS_TESTS_TRUE@ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -194,7 +196,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -245,8 +246,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -264,8 +263,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -276,8 +273,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -306,13 +301,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -357,6 +348,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -380,8 +373,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -428,8 +419,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -471,14 +460,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -490,32 +479,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -581,6 +571,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -626,10 +617,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/roseTests/loopProcessingTests/Makefile.in
===================================================================
--- trunk/tests/roseTests/loopProcessingTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/loopProcessingTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -132,7 +132,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -140,10 +141,11 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
LoopProcessor_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -192,7 +194,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -243,8 +244,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -262,8 +261,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -274,8 +271,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -304,13 +299,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -355,6 +346,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -378,8 +371,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -426,8 +417,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -469,14 +458,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -488,32 +477,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -579,6 +569,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -624,10 +615,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/roseTests/programAnalysisTests/Makefile.in
===================================================================
--- trunk/tests/roseTests/programAnalysisTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/programAnalysisTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -93,7 +93,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -110,6 +109,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -133,7 +133,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -141,26 +142,27 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-CFGTest_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+CFGTest_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
am_DataFlowTest_OBJECTS = DataFlowTest.$(OBJEXT)
DataFlowTest_OBJECTS = $(am_DataFlowTest_OBJECTS)
DataFlowTest_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
am_PtrAnalTest_OBJECTS = PtrAnalTest.$(OBJEXT)
PtrAnalTest_OBJECTS = $(am_PtrAnalTest_OBJECTS)
-PtrAnalTest_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+PtrAnalTest_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
am_StmtRefTest_OBJECTS = StmtRefTest.$(OBJEXT)
StmtRefTest_OBJECTS = $(am_StmtRefTest_OBJECTS)
-StmtRefTest_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+StmtRefTest_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
am_steensgaardTest1_OBJECTS = steensgaardTest1.$(OBJEXT)
steensgaardTest1_OBJECTS = $(am_steensgaardTest1_OBJECTS)
steensgaardTest1_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
am_steensgaardTest2_OBJECTS = steensgaardTest2.$(OBJEXT)
steensgaardTest2_OBJECTS = $(am_steensgaardTest2_OBJECTS)
steensgaardTest2_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -220,7 +222,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -272,8 +273,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -291,8 +290,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -303,8 +300,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -333,13 +328,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -384,6 +375,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -407,8 +400,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -455,8 +446,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -498,14 +487,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -517,32 +506,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -608,6 +598,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -653,10 +644,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/roseTests/programAnalysisTests/defUseAnalysisTests/Makefile.in
===================================================================
--- trunk/tests/roseTests/programAnalysisTests/defUseAnalysisTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/programAnalysisTests/defUseAnalysisTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -131,7 +131,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -139,9 +140,10 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
-runTest_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+runTest_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -190,7 +192,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -241,8 +242,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -260,8 +259,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -272,8 +269,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -302,13 +297,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -353,6 +344,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -376,8 +369,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -424,8 +415,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -467,14 +456,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -486,32 +475,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -577,6 +567,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -622,10 +613,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/roseTests/programAnalysisTests/sideEffectAnalysisTests/Makefile.in
===================================================================
--- trunk/tests/roseTests/programAnalysisTests/sideEffectAnalysisTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/programAnalysisTests/sideEffectAnalysisTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -133,7 +133,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -141,10 +142,11 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
@ROSE_USE_MYSQL_DATABASE_TRUE at testSideEffect_DEPENDENCIES = \
@ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_1) \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_6)
+ at ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_7)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -193,7 +195,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -244,8 +245,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -263,8 +262,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -275,8 +272,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -305,13 +300,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -356,6 +347,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -379,8 +372,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -427,8 +418,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -470,14 +459,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -489,32 +478,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -580,6 +570,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -625,10 +616,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/roseTests/programAnalysisTests/staticInterproceduralSlicingTests/Makefile.in
===================================================================
--- trunk/tests/roseTests/programAnalysisTests/staticInterproceduralSlicingTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/programAnalysisTests/staticInterproceduralSlicingTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -94,7 +94,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -111,6 +110,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -134,7 +134,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -142,35 +143,36 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
-generateCDG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+generateCDG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
am_generateDDG_OBJECTS = generateDDG.$(OBJEXT)
generateDDG_OBJECTS = $(am_generateDDG_OBJECTS)
-generateDDG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+generateDDG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
am_generateSDG_OBJECTS = generateSDG.$(OBJEXT)
generateSDG_OBJECTS = $(am_generateSDG_OBJECTS)
-generateSDG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+generateSDG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
am_generateSFBDT_OBJECTS = generateSFBDT.$(OBJEXT)
generateSFBDT_OBJECTS = $(am_generateSFBDT_OBJECTS)
generateSFBDT_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_generateSFCFG_OBJECTS = generateSFCFG.$(OBJEXT)
generateSFCFG_OBJECTS = $(am_generateSFCFG_OBJECTS)
generateSFCFG_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_generateSFDF_OBJECTS = generateSFDF.$(OBJEXT)
generateSFDF_OBJECTS = $(am_generateSFDF_OBJECTS)
generateSFDF_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_generateSFDT_OBJECTS = generateSFDT.$(OBJEXT)
generateSFDT_OBJECTS = $(am_generateSFDT_OBJECTS)
generateSFDT_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_multiPassTest_OBJECTS = multiPassTest.$(OBJEXT)
multiPassTest_OBJECTS = $(am_multiPassTest_OBJECTS)
multiPassTest_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -225,7 +227,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -276,8 +277,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -295,8 +294,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -307,8 +304,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -337,13 +332,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -388,6 +379,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -411,8 +404,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -459,8 +450,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -502,14 +491,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -521,32 +510,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -612,6 +602,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -657,10 +648,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/roseTests/programAnalysisTests/testCallGraphAnalysis/Makefile.in
===================================================================
--- trunk/tests/roseTests/programAnalysisTests/testCallGraphAnalysis/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/programAnalysisTests/testCallGraphAnalysis/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -131,7 +131,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -139,13 +140,14 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
-testCG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+testCG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
am_testCallGraph_OBJECTS = testCallGraph.$(OBJEXT)
testCallGraph_OBJECTS = $(am_testCallGraph_OBJECTS)
testCallGraph_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -194,7 +196,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -246,8 +247,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -265,8 +264,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -277,8 +274,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -307,13 +302,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -358,6 +349,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -381,8 +374,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -429,8 +420,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -472,14 +461,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -491,32 +480,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -582,6 +572,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -627,10 +618,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/roseTests/programTransformationTests/Makefile.in
===================================================================
--- trunk/tests/roseTests/programTransformationTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/programTransformationTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -96,7 +96,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -113,6 +112,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -136,7 +136,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -144,32 +145,33 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
-am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
-constantFoldingTest_DEPENDENCIES = $(am__DEPENDENCIES_8)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
+constantFoldingTest_DEPENDENCIES = $(am__DEPENDENCIES_9)
am_finiteDifferencingDemo_OBJECTS = finiteDifferencingDemo.$(OBJEXT)
finiteDifferencingDemo_OBJECTS = $(am_finiteDifferencingDemo_OBJECTS)
-finiteDifferencingDemo_DEPENDENCIES = $(am__DEPENDENCIES_8)
+finiteDifferencingDemo_DEPENDENCIES = $(am__DEPENDENCIES_9)
am_finiteDifferencingTest_OBJECTS = finiteDifferencingTest.$(OBJEXT)
finiteDifferencingTest_OBJECTS = $(am_finiteDifferencingTest_OBJECTS)
-finiteDifferencingTest_DEPENDENCIES = $(am__DEPENDENCIES_8)
+finiteDifferencingTest_DEPENDENCIES = $(am__DEPENDENCIES_9)
am_implicitCodeGenerationTest_OBJECTS = \
implicitCodeGenerationTest.$(OBJEXT)
implicitCodeGenerationTest_OBJECTS = \
$(am_implicitCodeGenerationTest_OBJECTS)
-implicitCodeGenerationTest_DEPENDENCIES = $(am__DEPENDENCIES_8)
+implicitCodeGenerationTest_DEPENDENCIES = $(am__DEPENDENCIES_9)
am_patternRewriteTest_OBJECTS = patternRewriteTest.$(OBJEXT)
patternRewriteTest_OBJECTS = $(am_patternRewriteTest_OBJECTS)
-patternRewriteTest_DEPENDENCIES = $(am__DEPENDENCIES_8)
+patternRewriteTest_DEPENDENCIES = $(am__DEPENDENCIES_9)
am_preTest_OBJECTS = preTest.$(OBJEXT)
preTest_OBJECTS = $(am_preTest_OBJECTS)
-preTest_DEPENDENCIES = $(am__DEPENDENCIES_8)
+preTest_DEPENDENCIES = $(am__DEPENDENCIES_9)
am_testFunctionNormalization_OBJECTS = \
testFunctionNormalization.$(OBJEXT)
testFunctionNormalization_OBJECTS = \
$(am_testFunctionNormalization_OBJECTS)
-testFunctionNormalization_DEPENDENCIES = $(am__DEPENDENCIES_8)
+testFunctionNormalization_DEPENDENCIES = $(am__DEPENDENCIES_9)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -228,7 +230,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -279,8 +280,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -298,8 +297,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -310,8 +307,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -340,13 +335,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -391,6 +382,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -414,8 +407,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -462,8 +453,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -505,14 +494,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -524,32 +513,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -615,6 +605,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -660,10 +651,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/roseTests/roseHPCToolkitTests/Makefile.in
===================================================================
--- trunk/tests/roseTests/roseHPCToolkitTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/roseHPCToolkitTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -99,7 +99,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -116,6 +115,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -234,7 +234,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -285,8 +284,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -304,8 +301,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -316,8 +311,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -346,13 +339,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -397,6 +386,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -420,8 +411,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -468,8 +457,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -514,14 +501,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -533,32 +520,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -624,6 +612,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -669,10 +658,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/roseTests/roseHPCToolkitTests/data/01/ANALYSIS/Makefile.in
===================================================================
--- trunk/tests/roseTests/roseHPCToolkitTests/data/01/ANALYSIS/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/roseHPCToolkitTests/data/01/ANALYSIS/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -64,7 +64,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -81,6 +80,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -127,7 +127,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -178,8 +177,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -197,8 +194,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -209,8 +204,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -239,13 +232,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -290,6 +279,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -313,8 +304,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -361,8 +350,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/tests/roseTests/roseHPCToolkitTests/data/01/Makefile.in
===================================================================
--- trunk/tests/roseTests/roseHPCToolkitTests/data/01/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/roseHPCToolkitTests/data/01/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -64,7 +64,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -81,6 +80,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -136,7 +136,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -187,8 +186,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -206,8 +203,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -218,8 +213,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -248,13 +241,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -299,6 +288,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -322,8 +313,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -370,8 +359,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/tests/roseTests/roseHPCToolkitTests/data/01/PROFILE/Makefile.in
===================================================================
--- trunk/tests/roseTests/roseHPCToolkitTests/data/01/PROFILE/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/roseHPCToolkitTests/data/01/PROFILE/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -64,7 +64,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -81,6 +80,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -127,7 +127,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -178,8 +177,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -197,8 +194,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -209,8 +204,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -239,13 +232,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -290,6 +279,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -313,8 +304,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -361,8 +350,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/tests/roseTests/roseHPCToolkitTests/data/01/PROGRAM/Makefile.in
===================================================================
--- trunk/tests/roseTests/roseHPCToolkitTests/data/01/PROGRAM/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/roseHPCToolkitTests/data/01/PROGRAM/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -64,7 +64,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -81,6 +80,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -127,7 +127,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -178,8 +177,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -197,8 +194,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -209,8 +204,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -239,13 +232,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -290,6 +279,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -313,8 +304,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -361,8 +350,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/tests/roseTests/roseHPCToolkitTests/data/02/Makefile.in
===================================================================
--- trunk/tests/roseTests/roseHPCToolkitTests/data/02/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/roseHPCToolkitTests/data/02/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -64,7 +64,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -81,6 +80,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -136,7 +136,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -187,8 +186,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -206,8 +203,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -218,8 +213,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -248,13 +241,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -299,6 +288,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -322,8 +313,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -370,8 +359,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/tests/roseTests/roseHPCToolkitTests/data/02/PROFILE/Makefile.in
===================================================================
--- trunk/tests/roseTests/roseHPCToolkitTests/data/02/PROFILE/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/roseHPCToolkitTests/data/02/PROFILE/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -64,7 +64,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -81,6 +80,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -127,7 +127,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -178,8 +177,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -197,8 +194,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -209,8 +204,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -239,13 +232,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -290,6 +279,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -313,8 +304,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -361,8 +350,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/tests/roseTests/roseHPCToolkitTests/data/02/struct_ls/Makefile.in
===================================================================
--- trunk/tests/roseTests/roseHPCToolkitTests/data/02/struct_ls/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/roseHPCToolkitTests/data/02/struct_ls/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -64,7 +64,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -81,6 +80,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -127,7 +127,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -178,8 +177,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -197,8 +194,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -209,8 +204,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -239,13 +232,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -290,6 +279,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -313,8 +304,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -361,8 +350,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/tests/roseTests/roseHPCToolkitTests/data/03/Makefile.in
===================================================================
--- trunk/tests/roseTests/roseHPCToolkitTests/data/03/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/roseHPCToolkitTests/data/03/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -64,7 +64,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -81,6 +80,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -136,7 +136,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -187,8 +186,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -206,8 +203,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -218,8 +213,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -248,13 +241,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -299,6 +288,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -322,8 +313,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -370,8 +359,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/tests/roseTests/roseHPCToolkitTests/data/03/PROFILE/Makefile.in
===================================================================
--- trunk/tests/roseTests/roseHPCToolkitTests/data/03/PROFILE/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/roseHPCToolkitTests/data/03/PROFILE/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -64,7 +64,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -81,6 +80,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -127,7 +127,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -178,8 +177,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -197,8 +194,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -209,8 +204,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -239,13 +232,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -290,6 +279,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -313,8 +304,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -361,8 +350,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/tests/roseTests/roseHPCToolkitTests/data/03/struct_ls/Makefile.in
===================================================================
--- trunk/tests/roseTests/roseHPCToolkitTests/data/03/struct_ls/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/roseHPCToolkitTests/data/03/struct_ls/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -64,7 +64,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -81,6 +80,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -127,7 +127,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -178,8 +177,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -197,8 +194,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -209,8 +204,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -239,13 +232,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -290,6 +279,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -313,8 +304,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -361,8 +350,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/tests/roseTests/roseHPCToolkitTests/data/Makefile.in
===================================================================
--- trunk/tests/roseTests/roseHPCToolkitTests/data/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/roseHPCToolkitTests/data/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -64,7 +64,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -81,6 +80,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -136,7 +136,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -187,8 +186,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -206,8 +203,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -218,8 +213,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -248,13 +241,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -299,6 +288,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -322,8 +313,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -370,8 +359,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/tests/roseTests/utilTests/Makefile.in
===================================================================
--- trunk/tests/roseTests/utilTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/roseTests/utilTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -92,7 +92,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -109,6 +108,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -179,7 +179,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -230,8 +229,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -249,8 +246,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -261,8 +256,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -291,13 +284,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -342,6 +331,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -365,8 +356,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -413,8 +402,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -456,14 +443,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -475,32 +462,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -566,6 +554,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -611,10 +600,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tests/translatorTests/Makefile.in
===================================================================
--- trunk/tests/translatorTests/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tests/translatorTests/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -91,7 +91,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -108,6 +107,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -130,7 +130,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -138,9 +139,10 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
-bug125_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
+bug125_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -189,7 +191,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -240,8 +241,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -259,8 +258,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -271,8 +268,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -301,13 +296,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -352,6 +343,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -375,8 +368,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -423,8 +414,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -466,14 +455,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -485,32 +474,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -576,6 +566,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -621,10 +612,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tools/Makefile.in
===================================================================
--- trunk/tools/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tools/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -63,7 +63,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -80,6 +79,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -129,7 +129,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -180,8 +179,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -199,8 +196,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -211,8 +206,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -241,13 +234,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -292,6 +281,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -315,8 +306,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -363,8 +352,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: trunk/tutorial/Makefile.in
===================================================================
--- trunk/tutorial/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tutorial/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -149,7 +149,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -166,6 +165,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -188,7 +188,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -196,505 +197,506 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
ASTGraphGenerator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_AST_PDF_Generator_OBJECTS = AST_PDF_Generator.$(OBJEXT)
AST_PDF_Generator_OBJECTS = $(am_AST_PDF_Generator_OBJECTS)
AST_PDF_Generator_LDADD = $(LDADD)
AST_PDF_Generator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_accumulatorAttributeTraversal_OBJECTS = \
accumulatorAttributeTraversal.$(OBJEXT)
accumulatorAttributeTraversal_OBJECTS = \
$(am_accumulatorAttributeTraversal_OBJECTS)
accumulatorAttributeTraversal_LDADD = $(LDADD)
accumulatorAttributeTraversal_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_addArbitraryTextForUnparser_OBJECTS = \
addArbitraryTextForUnparser.$(OBJEXT)
addArbitraryTextForUnparser_OBJECTS = \
$(am_addArbitraryTextForUnparser_OBJECTS)
addArbitraryTextForUnparser_LDADD = $(LDADD)
addArbitraryTextForUnparser_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_addAssignmentStmt_OBJECTS = addAssignmentStmt.$(OBJEXT)
addAssignmentStmt_OBJECTS = $(am_addAssignmentStmt_OBJECTS)
addAssignmentStmt_LDADD = $(LDADD)
addAssignmentStmt_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_addComments_OBJECTS = addComments.$(OBJEXT)
addComments_OBJECTS = $(am_addComments_OBJECTS)
addComments_LDADD = $(LDADD)
-addComments_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+addComments_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
am_addExpression_OBJECTS = addExpression.$(OBJEXT)
addExpression_OBJECTS = $(am_addExpression_OBJECTS)
addExpression_LDADD = $(LDADD)
addExpression_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_addFunctionCalls_OBJECTS = addFunctionCalls.$(OBJEXT)
addFunctionCalls_OBJECTS = $(am_addFunctionCalls_OBJECTS)
addFunctionCalls_LDADD = $(LDADD)
addFunctionCalls_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_addFunctionDeclaration_OBJECTS = addFunctionDeclaration.$(OBJEXT)
addFunctionDeclaration_OBJECTS = $(am_addFunctionDeclaration_OBJECTS)
addFunctionDeclaration_LDADD = $(LDADD)
addFunctionDeclaration_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_addFunctionDeclaration2_OBJECTS = \
addFunctionDeclaration2.$(OBJEXT)
addFunctionDeclaration2_OBJECTS = \
$(am_addFunctionDeclaration2_OBJECTS)
addFunctionDeclaration2_LDADD = $(LDADD)
addFunctionDeclaration2_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_addFunctionDeclaration3_OBJECTS = \
addFunctionDeclaration3.$(OBJEXT)
addFunctionDeclaration3_OBJECTS = \
$(am_addFunctionDeclaration3_OBJECTS)
addFunctionDeclaration3_LDADD = $(LDADD)
addFunctionDeclaration3_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_addStruct_OBJECTS = addStruct.$(OBJEXT)
addStruct_OBJECTS = $(am_addStruct_OBJECTS)
addStruct_LDADD = $(LDADD)
-addStruct_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+addStruct_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
am_addVariableDeclaration_OBJECTS = addVariableDeclaration.$(OBJEXT)
addVariableDeclaration_OBJECTS = $(am_addVariableDeclaration_OBJECTS)
addVariableDeclaration_LDADD = $(LDADD)
addVariableDeclaration_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_addVariableDeclaration2_OBJECTS = \
addVariableDeclaration2.$(OBJEXT)
addVariableDeclaration2_OBJECTS = \
$(am_addVariableDeclaration2_OBJECTS)
addVariableDeclaration2_LDADD = $(LDADD)
addVariableDeclaration2_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_astFileIO_GenerateBinaryFile_OBJECTS = \
astFileIO_GenerateBinaryFile.$(OBJEXT)
astFileIO_GenerateBinaryFile_OBJECTS = \
$(am_astFileIO_GenerateBinaryFile_OBJECTS)
astFileIO_GenerateBinaryFile_LDADD = $(LDADD)
astFileIO_GenerateBinaryFile_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_astFileIO_ReadMultipleASTs_OBJECTS = \
astFileIO_ReadMultipleASTs.$(OBJEXT)
astFileIO_ReadMultipleASTs_OBJECTS = \
$(am_astFileIO_ReadMultipleASTs_OBJECTS)
astFileIO_ReadMultipleASTs_LDADD = $(LDADD)
astFileIO_ReadMultipleASTs_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_bin_example_OBJECTS = bin_example.$(OBJEXT)
bin_example_OBJECTS = $(am_bin_example_OBJECTS)
bin_example_LDADD = $(LDADD)
-bin_example_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+bin_example_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
am_binaryAnalysis_OBJECTS = binaryAnalysis.$(OBJEXT)
binaryAnalysis_OBJECTS = $(am_binaryAnalysis_OBJECTS)
binaryAnalysis_LDADD = $(LDADD)
binaryAnalysis_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_binaryAnalysis_symbolTable_OBJECTS = \
binaryAnalysis_symbolTable.$(OBJEXT)
binaryAnalysis_symbolTable_OBJECTS = \
$(am_binaryAnalysis_symbolTable_OBJECTS)
binaryAnalysis_symbolTable_LDADD = $(LDADD)
binaryAnalysis_symbolTable_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_buildCFG_OBJECTS = buildCFG.$(OBJEXT)
buildCFG_OBJECTS = $(am_buildCFG_OBJECTS)
buildCFG_LDADD = $(LDADD)
-buildCFG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+buildCFG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
am_buildCG_OBJECTS = buildCG.$(OBJEXT)
buildCG_OBJECTS = $(am_buildCG_OBJECTS)
buildCG_LDADD = $(LDADD)
-buildCG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+buildCG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
am_callGraphAnalysis_OBJECTS = callGraphAnalysis.$(OBJEXT)
callGraphAnalysis_OBJECTS = $(am_callGraphAnalysis_OBJECTS)
callGraphAnalysis_LDADD = $(LDADD)
callGraphAnalysis_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_changeFunction_OBJECTS = changeFunction.$(OBJEXT)
changeFunction_OBJECTS = $(am_changeFunction_OBJECTS)
changeFunction_LDADD = $(LDADD)
changeFunction_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_charmSupport_OBJECTS = CharmSupport.$(OBJEXT)
charmSupport_OBJECTS = $(am_charmSupport_OBJECTS)
charmSupport_LDADD = $(LDADD)
charmSupport_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_classHierarchyGraph_OBJECTS = classHierarchyGraph.$(OBJEXT)
classHierarchyGraph_OBJECTS = $(am_classHierarchyGraph_OBJECTS)
classHierarchyGraph_LDADD = $(LDADD)
classHierarchyGraph_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_classicObjectOrientedVisitorPatternMemoryPoolTraversal_OBJECTS = classicObjectOrientedVisitorPatternMemoryPoolTraversal.$(OBJEXT)
classicObjectOrientedVisitorPatternMemoryPoolTraversal_OBJECTS = $(am_classicObjectOrientedVisitorPatternMemoryPoolTraversal_OBJECTS)
classicObjectOrientedVisitorPatternMemoryPoolTraversal_LDADD = \
$(LDADD)
classicObjectOrientedVisitorPatternMemoryPoolTraversal_DEPENDENCIES = \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
am_classicObjectOrientedVisitorPatternTraversal_OBJECTS = \
classicObjectOrientedVisitorPatternTraversal.$(OBJEXT)
classicObjectOrientedVisitorPatternTraversal_OBJECTS = \
$(am_classicObjectOrientedVisitorPatternTraversal_OBJECTS)
classicObjectOrientedVisitorPatternTraversal_LDADD = $(LDADD)
classicObjectOrientedVisitorPatternTraversal_DEPENDENCIES = \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
am_codeCoverage_OBJECTS = codeCoverage.$(OBJEXT) \
coverageCodeFromShmuel.$(OBJEXT)
codeCoverage_OBJECTS = $(am_codeCoverage_OBJECTS)
codeCoverage_LDADD = $(LDADD)
codeCoverage_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_codeGenerationFormatControl_OBJECTS = \
codeGenerationFormatControl.$(OBJEXT)
codeGenerationFormatControl_OBJECTS = \
$(am_codeGenerationFormatControl_OBJECTS)
codeGenerationFormatControl_LDADD = $(LDADD)
codeGenerationFormatControl_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_collectComments_OBJECTS = collectComments.$(OBJEXT)
collectComments_OBJECTS = $(am_collectComments_OBJECTS)
collectComments_LDADD = $(LDADD)
collectComments_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_collectDefineDirectives_OBJECTS = \
collectDefineDirectives.$(OBJEXT)
collectDefineDirectives_OBJECTS = \
$(am_collectDefineDirectives_OBJECTS)
collectDefineDirectives_LDADD = $(LDADD)
collectDefineDirectives_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_combinedTraversals_OBJECTS = combinedTraversals.$(OBJEXT)
combinedTraversals_OBJECTS = $(am_combinedTraversals_OBJECTS)
combinedTraversals_LDADD = $(LDADD)
combinedTraversals_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_commandlineProcessing_OBJECTS = commandlineProcessing.$(OBJEXT)
commandlineProcessing_OBJECTS = $(am_commandlineProcessing_OBJECTS)
commandlineProcessing_LDADD = $(LDADD)
commandlineProcessing_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_constantFoldingTransformation_OBJECTS = \
constantFoldingTransformation.$(OBJEXT)
constantFoldingTransformation_OBJECTS = \
$(am_constantFoldingTransformation_OBJECTS)
constantFoldingTransformation_LDADD = $(LDADD)
constantFoldingTransformation_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_constantUnFoldingTransformation_OBJECTS = \
constantUnFoldingTransformation.$(OBJEXT)
constantUnFoldingTransformation_OBJECTS = \
$(am_constantUnFoldingTransformation_OBJECTS)
constantUnFoldingTransformation_LDADD = $(LDADD)
constantUnFoldingTransformation_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_customGraphGeneration_OBJECTS = customGraphGeneration.$(OBJEXT)
customGraphGeneration_OBJECTS = $(am_customGraphGeneration_OBJECTS)
customGraphGeneration_LDADD = $(LDADD)
customGraphGeneration_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_customGraphGenerationWithColors_OBJECTS = \
customGraphGenerationWithColors.$(OBJEXT)
customGraphGenerationWithColors_OBJECTS = \
$(am_customGraphGenerationWithColors_OBJECTS)
customGraphGenerationWithColors_LDADD = $(LDADD)
customGraphGenerationWithColors_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_customGraphGenerationWithFiltering_OBJECTS = \
customGraphGenerationWithFiltering.$(OBJEXT)
customGraphGenerationWithFiltering_OBJECTS = \
$(am_customGraphGenerationWithFiltering_OBJECTS)
customGraphGenerationWithFiltering_LDADD = $(LDADD)
customGraphGenerationWithFiltering_DEPENDENCIES = \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
am_dataBaseUsage_OBJECTS = dataBaseUsage.$(OBJEXT)
dataBaseUsage_OBJECTS = $(am_dataBaseUsage_OBJECTS)
dataBaseUsage_LDADD = $(LDADD)
dataBaseUsage_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_dataFlowGraph_OBJECTS = dataFlowGraph.$(OBJEXT)
dataFlowGraph_OBJECTS = $(am_dataFlowGraph_OBJECTS)
dataFlowGraph_LDADD = $(LDADD)
dataFlowGraph_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_debuggingIRnodeToString_OBJECTS = \
debuggingIRnodeToString.$(OBJEXT)
debuggingIRnodeToString_OBJECTS = \
$(am_debuggingIRnodeToString_OBJECTS)
debuggingIRnodeToString_LDADD = $(LDADD)
debuggingIRnodeToString_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_debuggingSourceCodePositionInformation_OBJECTS = \
debuggingSourceCodePositionInformation.$(OBJEXT)
debuggingSourceCodePositionInformation_OBJECTS = \
$(am_debuggingSourceCodePositionInformation_OBJECTS)
debuggingSourceCodePositionInformation_LDADD = $(LDADD)
debuggingSourceCodePositionInformation_DEPENDENCIES = \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
am_defuseAnalysis_OBJECTS = defuseAnalysis.$(OBJEXT)
defuseAnalysis_OBJECTS = $(am_defuseAnalysis_OBJECTS)
defuseAnalysis_LDADD = $(LDADD)
defuseAnalysis_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_generatingUniqueNamesFromDeclaration_OBJECTS = \
generatingUniqueNamesFromDeclaration.$(OBJEXT)
generatingUniqueNamesFromDeclaration_OBJECTS = \
$(am_generatingUniqueNamesFromDeclaration_OBJECTS)
generatingUniqueNamesFromDeclaration_LDADD = $(LDADD)
generatingUniqueNamesFromDeclaration_DEPENDENCIES = \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
am_graphGenerationOfSubtree_OBJECTS = \
graphGenerationOfSubtree.$(OBJEXT)
graphGenerationOfSubtree_OBJECTS = \
$(am_graphGenerationOfSubtree_OBJECTS)
graphGenerationOfSubtree_LDADD = $(LDADD)
graphGenerationOfSubtree_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_graphTraversal_OBJECTS = graphTraversal.$(OBJEXT)
graphTraversal_OBJECTS = $(am_graphTraversal_OBJECTS)
graphTraversal_LDADD = $(LDADD)
graphTraversal_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_identityTranslator_OBJECTS = identityTranslator.$(OBJEXT)
identityTranslator_OBJECTS = $(am_identityTranslator_OBJECTS)
identityTranslator_LDADD = $(LDADD)
identityTranslator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_inheritedAndSynthesizedAttributeTraversal_OBJECTS = \
inheritedAndSynthesizedAttributeTraversal.$(OBJEXT)
inheritedAndSynthesizedAttributeTraversal_OBJECTS = \
$(am_inheritedAndSynthesizedAttributeTraversal_OBJECTS)
inheritedAndSynthesizedAttributeTraversal_LDADD = $(LDADD)
inheritedAndSynthesizedAttributeTraversal_DEPENDENCIES = \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
am_inheritedAttributeTraversal_OBJECTS = \
inheritedAttributeTraversal.$(OBJEXT)
inheritedAttributeTraversal_OBJECTS = \
$(am_inheritedAttributeTraversal_OBJECTS)
inheritedAttributeTraversal_LDADD = $(LDADD)
inheritedAttributeTraversal_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_inlineTransformations_OBJECTS = inlineTransformations.$(OBJEXT)
inlineTransformations_OBJECTS = $(am_inlineTransformations_OBJECTS)
inlineTransformations_LDADD = $(LDADD)
inlineTransformations_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_instrumentEndOfFunction_OBJECTS = \
instrumentEndOfFunction.$(OBJEXT)
instrumentEndOfFunction_OBJECTS = \
$(am_instrumentEndOfFunction_OBJECTS)
instrumentEndOfFunction_LDADD = $(LDADD)
instrumentEndOfFunction_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_instrumentationExample_OBJECTS = instrumentationExample.$(OBJEXT)
instrumentationExample_OBJECTS = $(am_instrumentationExample_OBJECTS)
instrumentationExample_LDADD = $(LDADD)
instrumentationExample_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_interveneAtVariables_OBJECTS = interveneAtVariables.$(OBJEXT)
interveneAtVariables_OBJECTS = $(am_interveneAtVariables_OBJECTS)
interveneAtVariables_LDADD = $(LDADD)
interveneAtVariables_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_lineReplacement_OBJECTS = lineReplacement.$(OBJEXT)
lineReplacement_OBJECTS = $(am_lineReplacement_OBJECTS)
lineReplacement_LDADD = $(LDADD)
lineReplacement_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_loopNestingInfoProcessing_OBJECTS = \
loopNestingInfoProcessing.$(OBJEXT)
loopNestingInfoProcessing_OBJECTS = \
$(am_loopNestingInfoProcessing_OBJECTS)
loopNestingInfoProcessing_LDADD = $(LDADD)
loopNestingInfoProcessing_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_loopOptimization_OBJECTS = loopOptimization.$(OBJEXT)
loopOptimization_OBJECTS = $(am_loopOptimization_OBJECTS)
loopOptimization_LDADD = $(LDADD)
loopOptimization_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_loopProcessor_OBJECTS = LoopProcessor.$(OBJEXT)
loopProcessor_OBJECTS = $(am_loopProcessor_OBJECTS)
loopProcessor_LDADD = $(LDADD)
loopProcessor_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_loopRecognition_OBJECTS = loopRecognition.$(OBJEXT)
loopRecognition_OBJECTS = $(am_loopRecognition_OBJECTS)
loopRecognition_LDADD = $(LDADD)
loopRecognition_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_nestedQueryExample_OBJECTS = nestedQueryExample.$(OBJEXT)
nestedQueryExample_OBJECTS = $(am_nestedQueryExample_OBJECTS)
nestedQueryExample_LDADD = $(LDADD)
nestedQueryExample_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_nestedTraversal_OBJECTS = nestedTraversal.$(OBJEXT)
nestedTraversal_OBJECTS = $(am_nestedTraversal_OBJECTS)
nestedTraversal_LDADD = $(LDADD)
nestedTraversal_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_partialRedundancyElimination_OBJECTS = \
partialRedundancyElimination.$(OBJEXT)
partialRedundancyElimination_OBJECTS = \
$(am_partialRedundancyElimination_OBJECTS)
partialRedundancyElimination_LDADD = $(LDADD)
partialRedundancyElimination_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_persistantAttributes_OBJECTS = persistantAttributes.$(OBJEXT)
persistantAttributes_OBJECTS = $(am_persistantAttributes_OBJECTS)
persistantAttributes_LDADD = $(LDADD)
persistantAttributes_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_prePostTraversal_OBJECTS = prePostTraversal.$(OBJEXT)
prePostTraversal_OBJECTS = $(am_prePostTraversal_OBJECTS)
prePostTraversal_LDADD = $(LDADD)
prePostTraversal_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_queryLibraryExample_OBJECTS = queryLibraryExample.$(OBJEXT)
queryLibraryExample_OBJECTS = $(am_queryLibraryExample_OBJECTS)
queryLibraryExample_LDADD = $(LDADD)
queryLibraryExample_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_resolveOverloadedFunction_OBJECTS = \
resolveOverloadedFunction.$(OBJEXT)
resolveOverloadedFunction_OBJECTS = \
$(am_resolveOverloadedFunction_OBJECTS)
resolveOverloadedFunction_LDADD = $(LDADD)
resolveOverloadedFunction_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_runtimeCheck_OBJECTS = runtimeCheck.$(OBJEXT)
runtimeCheck_OBJECTS = $(am_runtimeCheck_OBJECTS)
runtimeCheck_LDADD = $(LDADD)
runtimeCheck_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_scopeInformation_OBJECTS = scopeInformation.$(OBJEXT)
scopeInformation_OBJECTS = $(am_scopeInformation_OBJECTS)
scopeInformation_LDADD = $(LDADD)
scopeInformation_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_seedBugsExample_arrayIndexing_OBJECTS = \
seedBugsExample_arrayIndexing.$(OBJEXT)
seedBugsExample_arrayIndexing_OBJECTS = \
$(am_seedBugsExample_arrayIndexing_OBJECTS)
seedBugsExample_arrayIndexing_LDADD = $(LDADD)
seedBugsExample_arrayIndexing_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_selectedFileTranslation_OBJECTS = \
selectedFileTranslation.$(OBJEXT)
selectedFileTranslation_OBJECTS = \
$(am_selectedFileTranslation_OBJECTS)
selectedFileTranslation_LDADD = $(LDADD)
selectedFileTranslation_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_sharedMemoryTraversals_OBJECTS = sharedMemoryTraversals.$(OBJEXT)
sharedMemoryTraversals_OBJECTS = $(am_sharedMemoryTraversals_OBJECTS)
sharedMemoryTraversals_LDADD = $(LDADD)
sharedMemoryTraversals_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_sprintf_to_snprintf_OBJECTS = sprintf_to_snprintf.$(OBJEXT)
sprintf_to_snprintf_OBJECTS = $(am_sprintf_to_snprintf_OBJECTS)
sprintf_to_snprintf_LDADD = $(LDADD)
sprintf_to_snprintf_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_switchWithoutDefault_OBJECTS = switchWithoutDefault.$(OBJEXT)
switchWithoutDefault_OBJECTS = $(am_switchWithoutDefault_OBJECTS)
switchWithoutDefault_LDADD = $(LDADD)
switchWithoutDefault_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_symbolTableHandling_OBJECTS = symbolTableHandling.$(OBJEXT)
symbolTableHandling_OBJECTS = $(am_symbolTableHandling_OBJECTS)
symbolTableHandling_LDADD = $(LDADD)
symbolTableHandling_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_synthesizedAttributeTraversal_OBJECTS = \
synthesizedAttributeTraversal.$(OBJEXT)
synthesizedAttributeTraversal_OBJECTS = \
$(am_synthesizedAttributeTraversal_OBJECTS)
synthesizedAttributeTraversal_LDADD = $(LDADD)
synthesizedAttributeTraversal_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_tauInstrumenter_OBJECTS = tauInstrumenter.$(OBJEXT)
tauInstrumenter_OBJECTS = $(am_tauInstrumenter_OBJECTS)
tauInstrumenter_LDADD = $(LDADD)
tauInstrumenter_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_templateParameter_OBJECTS = templateParameter.$(OBJEXT)
templateParameter_OBJECTS = $(am_templateParameter_OBJECTS)
templateParameter_LDADD = $(LDADD)
templateParameter_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_traversalShortCircuit_OBJECTS = traversalShortCircuit.$(OBJEXT)
traversalShortCircuit_OBJECTS = $(am_traversalShortCircuit_OBJECTS)
traversalShortCircuit_LDADD = $(LDADD)
traversalShortCircuit_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_traverseIRnodeTypes_OBJECTS = traverseIRnodeTypes.$(OBJEXT)
traverseIRnodeTypes_OBJECTS = $(am_traverseIRnodeTypes_OBJECTS)
traverseIRnodeTypes_LDADD = $(LDADD)
traverseIRnodeTypes_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_typeInfoFromFunctionParameters_OBJECTS = \
typeInfoFromFunctionParameters.$(OBJEXT)
typeInfoFromFunctionParameters_OBJECTS = \
$(am_typeInfoFromFunctionParameters_OBJECTS)
typeInfoFromFunctionParameters_LDADD = $(LDADD)
typeInfoFromFunctionParameters_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_typeTransformation_OBJECTS = typeTransformation.$(OBJEXT)
typeTransformation_OBJECTS = $(am_typeTransformation_OBJECTS)
typeTransformation_LDADD = $(LDADD)
typeTransformation_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_virtualCFG_OBJECTS = virtualCFG.$(OBJEXT)
virtualCFG_OBJECTS = $(am_virtualCFG_OBJECTS)
virtualCFG_LDADD = $(LDADD)
-virtualCFG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+virtualCFG_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
am_virtualFunctionIdentification_OBJECTS = \
virtualFunctionIdentification.$(OBJEXT)
virtualFunctionIdentification_OBJECTS = \
$(am_virtualFunctionIdentification_OBJECTS)
virtualFunctionIdentification_LDADD = $(LDADD)
virtualFunctionIdentification_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_visitorMemoryPoolTraversal_OBJECTS = \
visitorMemoryPoolTraversal.$(OBJEXT)
visitorMemoryPoolTraversal_OBJECTS = \
$(am_visitorMemoryPoolTraversal_OBJECTS)
visitorMemoryPoolTraversal_LDADD = $(LDADD)
visitorMemoryPoolTraversal_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_visitorTraversal_OBJECTS = visitorTraversal.$(OBJEXT)
visitorTraversal_OBJECTS = $(am_visitorTraversal_OBJECTS)
visitorTraversal_LDADD = $(LDADD)
visitorTraversal_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_volatileTypeModifier_OBJECTS = volatileTypeModifier.$(OBJEXT)
volatileTypeModifier_OBJECTS = $(am_volatileTypeModifier_OBJECTS)
volatileTypeModifier_LDADD = $(LDADD)
volatileTypeModifier_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_wholeASTGraphGenerator_OBJECTS = wholeASTGraphGenerator.$(OBJEXT)
wholeASTGraphGenerator_OBJECTS = $(am_wholeASTGraphGenerator_OBJECTS)
wholeASTGraphGenerator_LDADD = $(LDADD)
wholeASTGraphGenerator_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_wholeGraphAST_OBJECTS = wholeGraphAST.$(OBJEXT)
wholeGraphAST_OBJECTS = $(am_wholeGraphAST_OBJECTS)
wholeGraphAST_LDADD = $(LDADD)
wholeGraphAST_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
am_wholeGraphFilterOnPersistantAttributes_OBJECTS = \
wholeGraphFilterOnPersistantAttributes.$(OBJEXT)
wholeGraphFilterOnPersistantAttributes_OBJECTS = \
$(am_wholeGraphFilterOnPersistantAttributes_OBJECTS)
wholeGraphFilterOnPersistantAttributes_LDADD = $(LDADD)
wholeGraphFilterOnPersistantAttributes_DEPENDENCIES = \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -887,7 +889,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -938,8 +939,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -957,8 +956,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -969,8 +966,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -999,13 +994,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -1050,6 +1041,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -1073,8 +1066,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -1121,8 +1112,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -1164,14 +1153,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -1183,32 +1172,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -1274,6 +1264,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -1319,10 +1310,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tutorial/database/Makefile.in
===================================================================
--- trunk/tutorial/database/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tutorial/database/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -95,7 +95,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -112,6 +111,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -138,7 +138,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -146,10 +147,11 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
@ROSE_USE_MYSQL_DATABASE_TRUE at customtable_example_DEPENDENCIES = \
@ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_1) \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_6) \
+ at ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_7) \
@ROSE_USE_MYSQL_DATABASE_TRUE@ $(top_builddir)/projects/dataBase/librosedatabase.a \
@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/lib/mysql/libmysqlclient.a \
@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/lib/libsqlplus.a
@@ -160,7 +162,7 @@
databasegraph_example_LDADD = $(LDADD)
@ROSE_USE_MYSQL_DATABASE_TRUE at databasegraph_example_DEPENDENCIES = \
@ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_1) \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_6) \
+ at ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_7) \
@ROSE_USE_MYSQL_DATABASE_TRUE@ $(top_builddir)/projects/dataBase/librosedatabase.a \
@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/lib/mysql/libmysqlclient.a \
@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/lib/libsqlplus.a
@@ -171,7 +173,7 @@
rosedb_example_LDADD = $(LDADD)
@ROSE_USE_MYSQL_DATABASE_TRUE at rosedb_example_DEPENDENCIES = \
@ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_1) \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_6) \
+ at ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_7) \
@ROSE_USE_MYSQL_DATABASE_TRUE@ $(top_builddir)/projects/dataBase/librosedatabase.a \
@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/lib/mysql/libmysqlclient.a \
@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/lib/libsqlplus.a
@@ -182,7 +184,7 @@
simplecallgraph_example_LDADD = $(LDADD)
@ROSE_USE_MYSQL_DATABASE_TRUE at simplecallgraph_example_DEPENDENCIES = \
@ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_1) \
- at ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_6) \
+ at ROSE_USE_MYSQL_DATABASE_TRUE@ $(am__DEPENDENCIES_7) \
@ROSE_USE_MYSQL_DATABASE_TRUE@ $(top_builddir)/projects/dataBase/librosedatabase.a \
@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/lib/mysql/libmysqlclient.a \
@ROSE_USE_MYSQL_DATABASE_TRUE@ @MySQL_path@/lib/libsqlplus.a
@@ -239,7 +241,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -290,8 +291,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -309,8 +308,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -321,8 +318,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -351,13 +346,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -402,6 +393,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -425,8 +418,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -473,8 +464,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -516,14 +505,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -535,32 +524,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -626,6 +616,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -671,10 +662,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tutorial/outliner/Makefile.in
===================================================================
--- trunk/tutorial/outliner/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tutorial/outliner/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -95,7 +95,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -112,6 +111,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -180,7 +180,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -231,8 +230,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -250,8 +247,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -262,8 +257,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -292,13 +285,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -343,6 +332,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -366,8 +357,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -414,8 +403,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -457,14 +444,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -476,32 +463,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -567,6 +555,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -612,10 +601,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
Modified: trunk/tutorial/roseHPCT/Makefile.in
===================================================================
--- trunk/tutorial/roseHPCT/Makefile.in 2008-09-11 20:28:32 UTC (rev 31)
+++ trunk/tutorial/roseHPCT/Makefile.in 2008-09-12 20:14:11 UTC (rev 32)
@@ -98,7 +98,6 @@
$(top_srcdir)/config/enable-rosehpct.m4 \
$(top_srcdir)/config/generate-backend-compiler-specific-headers.m4 \
$(top_srcdir)/config/mdl_have_opengl.m4 \
- $(top_srcdir)/config/qrose.m4 \
$(top_srcdir)/config/qrose_indigo_1.m4 \
$(top_srcdir)/config/qrose_indigo_1_windows.m4 \
$(top_srcdir)/config/support-bddbddb.m4 \
@@ -115,6 +114,7 @@
$(top_srcdir)/config/support-purify.m4 \
$(top_srcdir)/config/support-python.m4 \
$(top_srcdir)/config/support-visualization.m4 \
+ $(top_srcdir)/config/support-windows.m4 \
$(top_srcdir)/config/support-yices.m4 \
$(top_srcdir)/config/swig_enable_cxx.m4 \
$(top_srcdir)/configure.in
@@ -139,7 +139,8 @@
@ROSE_USE_PHP_TRUE at am__DEPENDENCIES_5 = $(php_path)/lib/libphc.so \
@ROSE_USE_PHP_TRUE@ $(php_path)/lib/libphp5.so \
@ROSE_USE_PHP_TRUE@ $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_6 = $(top_builddir)/src/librose.la \
+ at ROSE_USE_QT_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(top_builddir)/src/librose.la \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -147,10 +148,11 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5)
-am__DEPENDENCIES_7 = $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6)
+am__DEPENDENCIES_8 = $(am__DEPENDENCIES_7)
attachMetrics_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_7)
+ $(am__DEPENDENCIES_8)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp =
am__depfiles_maybe =
@@ -200,7 +202,6 @@
CLASSPATH = @CLASSPATH@
CONVENIENCE_LTDL_FALSE = @CONVENIENCE_LTDL_FALSE@
CONVENIENCE_LTDL_TRUE = @CONVENIENCE_LTDL_TRUE@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
@@ -251,8 +252,6 @@
GLUT_include_path = @GLUT_include_path@
GLUT_libs_path = @GLUT_libs_path@
GL_CFLAGS = @GL_CFLAGS@
-GL_INCLUDES = @GL_INCLUDES@
-GL_LDFLAGS = @GL_LDFLAGS@
GL_LIBS = @GL_LIBS@
GraphViz_include_path = @GraphViz_include_path@
GraphViz_libs_path = @GraphViz_libs_path@
@@ -270,8 +269,6 @@
JAVA_JVM_INCLUDE = @JAVA_JVM_INCLUDE@
JAVA_JVM_LINK = @JAVA_JVM_LINK@
JAVA_PATH = @JAVA_PATH@
-JPEG_FALSE = @JPEG_FALSE@
-JPEG_TRUE = @JPEG_TRUE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
@@ -282,8 +279,6 @@
LIBS = @LIBS@
LIBS_WITH_RPATH = @LIBS_WITH_RPATH@
LIBTOOL = @LIBTOOL@ --quiet
-LIB_GL = @LIB_GL@
-LIB_IMAGES_LDFLAGS = @LIB_IMAGES_LDFLAGS@
LN_S = @LN_S@
LTDLINCL = @LTDLINCL@
LTLIBOBJS = @LTLIBOBJS@
@@ -312,13 +307,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PNG_FALSE = @PNG_FALSE@
-PNG_TRUE = @PNG_TRUE@
PURIFY_OPTIONS = @PURIFY_OPTIONS@
Pxx_INCLUDES = @Pxx_INCLUDES@
Pxx_LIBS = @Pxx_LIBS@
-QROSE_CXXFLAGS = @QROSE_CXXFLAGS@
-QROSE_LDFLAGS = @QROSE_LDFLAGS@
QROSE_PREFIX = @QROSE_PREFIX@
QROSE_USE_MINGW32_FALSE = @QROSE_USE_MINGW32_FALSE@
QROSE_USE_MINGW32_TRUE = @QROSE_USE_MINGW32_TRUE@
@@ -363,6 +354,8 @@
ROSE_USE_PHP_TRUE = @ROSE_USE_PHP_TRUE@
ROSE_USE_QROSE_FALSE = @ROSE_USE_QROSE_FALSE@
ROSE_USE_QROSE_TRUE = @ROSE_USE_QROSE_TRUE@
+ROSE_USE_QT_FALSE = @ROSE_USE_QT_FALSE@
+ROSE_USE_QT_TRUE = @ROSE_USE_QT_TRUE@
ROSE_USE_SQLITE_DATABASE_FALSE = @ROSE_USE_SQLITE_DATABASE_FALSE@
ROSE_USE_SQLITE_DATABASE_TRUE = @ROSE_USE_SQLITE_DATABASE_TRUE@
ROSE_USE_VISUALIZATION_FALSE = @ROSE_USE_VISUALIZATION_FALSE@
@@ -386,8 +379,6 @@
USE_BINARY_ANALYSIS_TESTS_TRUE = @USE_BINARY_ANALYSIS_TESTS_TRUE@
USE_GCJ_FALSE = @USE_GCJ_FALSE@
USE_GCJ_TRUE = @USE_GCJ_TRUE@
-USE_QROSE_FALSE = @USE_QROSE_FALSE@
-USE_QROSE_TRUE = @USE_QROSE_TRUE@
USE_ROSE_IN_BUILD_TREE_VAR_FALSE = @USE_ROSE_IN_BUILD_TREE_VAR_FALSE@
USE_ROSE_IN_BUILD_TREE_VAR_TRUE = @USE_ROSE_IN_BUILD_TREE_VAR_TRUE@
USE_VALGRIND_FALSE = @USE_VALGRIND_FALSE@
@@ -434,8 +425,6 @@
edg_union_struct_debugging_value = @edg_union_struct_debugging_value@
exec_prefix = @exec_prefix@
gcc_omp_path = @gcc_omp_path@
-gl_includes = @gl_includes@
-gl_libraries = @gl_libraries@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -477,14 +466,14 @@
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_INCLUDE = -I$(top_srcdir)/src/midend/programAnalysis/sideEffectAnalysis
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_OBJS = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIB_NAME = sideEffect
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
+# ROSE_SIDEEFFECTS_LIB_FILE = lib$(ROSE_SIDEEFFECTS_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS_FILE_WITH_PATH = $(top_builddir)/src/midend/programAnalysis/sideEffectAnalysis/$(ROSE_SIDEEFFECTS_LIB_FILE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_SIDEEFFECTS_LIBS = -l$(ROSE_SIDEEFFECTS_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at BOOST_INCLUDE = -idirafter /home/thuerey1/local/include
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_INCLUDE = -I$(top_srcdir)/src/roseExtensions/databaseConnection $(BOOST_INCLUDE)
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/databaseConnection/*.o
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIB_NAME = rosedatabase
- at ROSE_USE_MYSQL_DATABASE_TRUE@ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
+# ROSE_DATABASE_LIB_FILE = lib$(ROSE_DATABASE_LIB_NAME).so
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS_FILE_WITH_PATH = $(top_builddir)/src/roseExtensions/databaseConnection/lib$(ROSE_DATABASE_LIB_FILE).a
@ROSE_USE_MYSQL_DATABASE_TRUE at ROSE_DATABASE_LIBS = -l$(ROSE_DATABASE_LIB_NAME)
@ROSE_USE_MYSQL_DATABASE_TRUE at MYSQL_DATABASE_LIBS = $(MYSQL_LDFLAGS)
@@ -496,32 +485,33 @@
@ROSE_USE_SQLITE_DATABASE_TRUE at SQLITE_DATABASE_LIBS = $(SQLITE3_LDFLAGS)
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_OBJS = $(top_builddir)/src/roseExtensions/SQLiteConnection/*.o
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIB_NAME = roseSQLiteDatabase
- at ROSE_USE_SQLITE_DATABASE_TRUE@ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
+# ROSE_SQLITE_DATABASE_LIB_FILE = lib$(ROSE_SQLITE_DATABASE_LIB_NAME).so
@ROSE_USE_SQLITE_DATABASE_TRUE at ROSE_SQLITE_DATABASE_LIBS = -l$(ROSE_SQLITE_DATABASE_LIB_NAME)
# This is properly handled by automake even when specified in an include file
EDG_LIBS = @EDG_LIBS@
# Conditional support for Gabriel's QRose GUI Library
- at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRGui \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRCodeBox \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRTree \
- at ROSE_USE_QROSE_TRUE@ -I$(top_srcdir)/src/roseIndependentSupport/graphicalUserInterface/src/QRQueryBox \
- at ROSE_USE_QROSE_TRUE@ $(QT_INCLUDES)
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_INCLUDE = -I${QROSE_PREFIX}/include
+# ROSE_GUI_LIBS = -lqrose
+ at ROSE_USE_QROSE_TRUE@ROSE_GUI_LIBS_WITH_PATH = -L${QROSE_PREFIX}/lib -lqrose
+# ROSE_GUI_LIB_FILE = libqrose.a
+ at ROSE_USE_QT_TRUE@ROSE_QT_INCLUDE = $(QT_INCLUDES)
+# ROSE_QT_LIBS = -lqt
+ at ROSE_USE_QT_TRUE@ROSE_QT_LIBS_WITH_PATH = ${QT_LDFLAGS}
+# ROSE_QT_LIB_FILE = libqt.a
-
# ROSE-HPCToolkit module
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_INCLUDES = -I$(top_srcdir)/src/roseExtensions/roseHPCToolkit/include
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS = -lrosehpct
@ROSE_BUILD_ROSEHPCT_TRUE at ROSE_ROSEHPCT_LIBS_WITH_PATH = $(top_builddir)/src/roseExtensions/roseHPCToolkit/src/librosehpct.la
- at ROSE_BUILD_ROSEHPCT_TRUE@ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
+# ROSE_ROSEHPCT_LIB_FILE = librosehpct.so
# ROSE-YICES Package (destributed by SRI as a static library)
@ROSE_USE_YICES_TRUE at ROSE_YICES_INCLUDES = -I$(yices_path)/include
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS = -lyices
@ROSE_USE_YICES_TRUE at ROSE_YICES_LIBS_WITH_PATH = $(yices_path)/lib/libyices.a
- at ROSE_USE_YICES_TRUE@ROSE_YICES_LIB_FILE = libyices.a
+# ROSE_YICES_LIB_FILE = libyices.a
# ROSE-WINE Package (Wine is a package to permit execution of Windows binaries under Linux)
@ROSE_USE_WINDOWS_ANALYSIS_SUPPORT_TRUE at ROSE_WINE_INCLUDES = -I$(wine_path)/include
@@ -587,6 +577,7 @@
$(ROSE_SIDEEFFECTS_INCLUDE) \
$(ROSE_DATABASE_INCLUDE) \
$(ROSE_GUI_INCLUDE) \
+ $(ROSE_QT_INCLUDE) \
$(MYSQL_DATABASE_INCLUDE) \
$(ROSE_SQLITE_DATABASE_INCLUDE) \
$(SQLITE_DATABASE_INCLUDE) \
@@ -632,10 +623,12 @@
# ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(LEXLIB) $(MYSQL_DATABASE_LIBS) $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(WAVE_LDFLAGS) $(WAVE_LIBRARIES) $(WAVE_LIBS) $(JAVA_JVM_LIB) $(RT_LIBS)
ROSE_LIBS = $(top_builddir)/src/librose.la -lm $(MYSQL_DATABASE_LIBS) \
- $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
- $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
- $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
- $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH)
+ $(SQLITE_DATABASE_LIBS) $(LIB_QT) $(BOOST_LDFLAGS) $(BOOST_DATE_TIME_LIB) \
+ $(BOOST_THREAD_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) \
+ $(BOOST_REGEX_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_SERIALIZATION_LIB) \
+ $(BOOST_WAVE_LIB) $(SQLITE3_LDFLAGS) $(JAVA_JVM_LINK) $(RT_LIBS) \
+ $(ROSE_YICES_LIBS_WITH_PATH) $(ROSE_PHP_LIBS_WITH_PATH) \
+ $(ROSE_GUI_LIBS_WITH_PATH) $(ROSE_QT_LIBS_WITH_PATH)
# This ROSE_SEPARATE_LIBS is used for the linking of preprocessor.C used within
More information about the Rose-commits
mailing list