|
From: Erik B. <do...@us...> - 2004-11-07 23:11:11
|
Update of /cvsroot/seq/showeq In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18654 Modified Files: Tag: pre_5_0_beta AUTHORS ChangeLog INSTALL Makefile.am Makefile.dist acinclude.m4 configure.in Added Files: Tag: pre_5_0_beta Doxyfile doxygen.am doxygen.cfg showeq.kdevelop Removed Files: Tag: pre_5_0_beta showeq.kdevprj Log Message: 5.0.0.16 --- NEW FILE: Doxyfile --- # Doxyfile 1.3.7-KDevelop #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = ShowEQ PROJECT_NUMBER = OUTPUT_DIRECTORY = dox CREATE_SUBDIRS = YES OUTPUT_LANGUAGE = English USE_WINDOWS_ENCODING = NO BRIEF_MEMBER_DESC = YES REPEAT_BRIEF = YES ABBREVIATE_BRIEF = "The $name class" \ "The $name widget" \ "The $name file" \ is \ provides \ specifies \ contains \ represents \ a \ an \ the ALWAYS_DETAILED_SEC = YES INLINE_INHERITED_MEMB = YES FULL_PATH_NAMES = YES STRIP_FROM_PATH = /home/zaphod/dev/showeq/ STRIP_FROM_INC_PATH = SHORT_NAMES = NO JAVADOC_AUTOBRIEF = YES MULTILINE_CPP_IS_BRIEF = NO DETAILS_AT_TOP = YES INHERIT_DOCS = YES DISTRIBUTE_GROUP_DOC = NO TAB_SIZE = 8 ALIASES = OPTIMIZE_OUTPUT_FOR_C = NO OPTIMIZE_OUTPUT_JAVA = NO SUBGROUPING = YES #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- EXTRACT_ALL = YES EXTRACT_PRIVATE = NO EXTRACT_STATIC = NO EXTRACT_LOCAL_CLASSES = YES EXTRACT_LOCAL_METHODS = NO HIDE_UNDOC_MEMBERS = NO HIDE_UNDOC_CLASSES = NO HIDE_FRIEND_COMPOUNDS = NO HIDE_IN_BODY_DOCS = NO INTERNAL_DOCS = NO CASE_SENSE_NAMES = YES HIDE_SCOPE_NAMES = NO SHOW_INCLUDE_FILES = YES INLINE_INFO = YES SORT_MEMBER_DOCS = YES SORT_BRIEF_DOCS = NO SORT_BY_SCOPE_NAME = NO GENERATE_TODOLIST = YES GENERATE_TESTLIST = YES GENERATE_BUGLIST = YES GENERATE_DEPRECATEDLIST= YES ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 30 SHOW_USED_FILES = YES #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- QUIET = NO WARNINGS = YES WARN_IF_UNDOCUMENTED = YES WARN_IF_DOC_ERROR = YES WARN_FORMAT = "$file:$line: $text" WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- INPUT = /home/zaphod/dev/showeq FILE_PATTERNS = *.c \ *.cc \ *.cxx \ *.cpp \ *.c++ \ *.java \ *.ii \ *.ixx \ *.ipp \ *.i++ \ *.inl \ *.h \ *.hh \ *.hxx \ *.hpp \ *.h++ \ *.idl \ *.odl \ *.cs \ *.php \ *.php3 \ *.inc \ *.m \ *.mm \ *.C \ *.CC \ *.C++ \ *.II \ *.I++ \ *.H \ *.HH \ *.H++ \ *.CS \ *.PHP \ *.PHP3 \ *.M \ *.MM \ *.C \ *.H \ *.tlh \ *.diff \ *.patch \ *.moc \ *.xpm \ *.dox RECURSIVE = YES EXCLUDE = m_*.cpp EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = EXAMPLE_PATH = EXAMPLE_PATTERNS = * EXAMPLE_RECURSIVE = NO IMAGE_PATH = INPUT_FILTER = FILTER_SOURCE_FILES = NO #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- SOURCE_BROWSER = YES INLINE_SOURCES = NO STRIP_CODE_COMMENTS = YES REFERENCED_BY_RELATION = YES REFERENCES_RELATION = YES VERBATIM_HEADERS = YES #--------------------------------------------------------------------------- # configuration options related to the alphabetical class index #--------------------------------------------------------------------------- ALPHABETICAL_INDEX = YES COLS_IN_ALPHA_INDEX = 5 IGNORE_PREFIX = #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- GENERATE_HTML = YES HTML_OUTPUT = html HTML_FILE_EXTENSION = .html HTML_HEADER = HTML_FOOTER = HTML_STYLESHEET = HTML_ALIGN_MEMBERS = YES GENERATE_HTMLHELP = NO CHM_FILE = HHC_LOCATION = GENERATE_CHI = NO BINARY_TOC = NO TOC_EXPAND = NO DISABLE_INDEX = NO ENUM_VALUES_PER_LINE = 4 GENERATE_TREEVIEW = YES TREEVIEW_WIDTH = 250 #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- GENERATE_LATEX = NO LATEX_OUTPUT = latex LATEX_CMD_NAME = latex MAKEINDEX_CMD_NAME = makeindex COMPACT_LATEX = NO PAPER_TYPE = a4wide EXTRA_PACKAGES = LATEX_HEADER = PDF_HYPERLINKS = NO USE_PDFLATEX = NO LATEX_BATCHMODE = NO LATEX_HIDE_INDICES = NO #--------------------------------------------------------------------------- # configuration options related to the RTF output #--------------------------------------------------------------------------- GENERATE_RTF = NO RTF_OUTPUT = rtf COMPACT_RTF = NO RTF_HYPERLINKS = NO RTF_STYLESHEET_FILE = RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- GENERATE_MAN = NO MAN_OUTPUT = man MAN_EXTENSION = .1 MAN_LINKS = NO #--------------------------------------------------------------------------- # configuration options related to the XML output #--------------------------------------------------------------------------- GENERATE_XML = YES XML_OUTPUT = xml XML_SCHEMA = XML_DTD = XML_PROGRAMLISTING = YES #--------------------------------------------------------------------------- # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- GENERATE_AUTOGEN_DEF = NO #--------------------------------------------------------------------------- # configuration options related to the Perl module output #--------------------------------------------------------------------------- GENERATE_PERLMOD = NO PERLMOD_LATEX = NO PERLMOD_PRETTY = YES PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- # Configuration options related to the preprocessor #--------------------------------------------------------------------------- ENABLE_PREPROCESSING = YES MACRO_EXPANSION = NO EXPAND_ONLY_PREDEF = NO SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = PREDEFINED = DOXYGEN_SHOULD_SKIP_THIS EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- # Configuration::additions related to external references #--------------------------------------------------------------------------- TAGFILES = GENERATE_TAGFILE = dox/showeq.tag ALLEXTERNALS = NO EXTERNAL_GROUPS = YES PERL_PATH = /usr/bin/perl #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- CLASS_DIAGRAMS = YES HIDE_UNDOC_RELATIONS = YES HAVE_DOT = YES CLASS_GRAPH = YES COLLABORATION_GRAPH = YES UML_LOOK = YES TEMPLATE_RELATIONS = YES INCLUDE_GRAPH = YES INCLUDED_BY_GRAPH = YES CALL_GRAPH = NO GRAPHICAL_HIERARCHY = YES DOT_IMAGE_FORMAT = png DOT_PATH = /usr/bin DOTFILE_DIRS = MAX_DOT_GRAPH_WIDTH = 1024 MAX_DOT_GRAPH_HEIGHT = 1024 MAX_DOT_GRAPH_DEPTH = 1000 GENERATE_LEGEND = YES DOT_CLEANUP = YES #--------------------------------------------------------------------------- # Configuration::additions related to the search engine #--------------------------------------------------------------------------- SEARCHENGINE = YES Index: Makefile.dist =================================================================== RCS file: /cvsroot/seq/showeq/Makefile.dist,v retrieving revision 1.3.16.1 retrieving revision 1.3.16.2 diff -u -d -r1.3.16.1 -r1.3.16.2 --- Makefile.dist 24 Sep 2004 04:25:41 -0000 1.3.16.1 +++ Makefile.dist 7 Nov 2004 23:09:53 -0000 1.3.16.2 @@ -4,7 +4,7 @@ AUTOMAKE = automake AUTOCONF = autoconf LIBTOOLIZE_ARGS = --force --copy --automake -ACLOCAL_ARGS = +ACLOCAL_ARGS = -I m4 AUTOHEADER_ARGS = --force AUTOMAKE_ARGS = --add-missing --copy --include-deps AUTOCONF_ARGS = --- NEW FILE: showeq.kdevelop --- <?xml version = '1.0'?> <kdevelop> <general> <author>Zaphod</author> <email>do...@us...</email> <version>$VERSION$</version> <projectmanagement>KDevAutoProject</projectmanagement> <primarylanguage>C++</primarylanguage> <ignoreparts> <part>KDevClearCase</part> <part>KDevPerforce</part> <part>KDevsubversion</part> </ignoreparts> <projectdirectory>.</projectdirectory> <absoluteprojectpath>false</absoluteprojectpath> <description>ShowEQ sits passively and waits for Everquest packets to pass by on the ethernet card. It rebuilds the data stream and displays useful information about the data being sent between client and server. ShowEQ is free software, distributed under the terms of the [GNU] General Public License, version 2. For more information, see the file COPYING.</description> <secondaryLanguages> <language>C</language> <language>Perl</language> </secondaryLanguages> </general> <kdevautoproject> <general> <activetarget>src/patcher</activetarget> <useconfiguration>debug</useconfiguration> </general> <run> <mainprogram>src/showeq</mainprogram> <directoryradio>executable</directoryradio> <customdirectory>/</customdirectory> <programargs/> <terminal>false</terminal> <autocompile>true</autocompile> <envvars/> </run> <configurations> <optimized> <builddir>optimized</builddir> <ccompiler>GccOptions</ccompiler> <cxxcompiler>GppOptions</cxxcompiler> <f77compiler>G77Options</f77compiler> <cxxflags>-O2 -g0</cxxflags> </optimized> <debug> <configargs>--enable-debug=full --disable-inlines --enable-maintainer-mode --enable-dependency-tracking </configargs> <builddir>debug</builddir> <ccompiler>kdevgccoptions</ccompiler> <cxxcompiler>kdevgppoptions</cxxcompiler> <f77compiler>kdevpgf77options</f77compiler> <cxxflags>-O0 -g3</cxxflags> <envvars/> <topsourcedir/> <cppflags/> <ldflags/> <ccompilerbinary/> <cxxcompilerbinary/> <f77compilerbinary/> <cflags/> <f77flags/> </debug> </configurations> <make> <envvars> <envvar value="2.5" name="WANT_AUTOCONF" /> <envvar value="1" name="WANT_AUTOCONF_2_5" /> <envvar value="1.8" name="WANT_AUTOMAKE" /> <envvar value="1" name="WANT_AUTOMAKE_1_8" /> </envvars> <abortonerror>true</abortonerror> <numberofjobs>1</numberofjobs> <dontact>false</dontact> <makebin/> <prio>0</prio> </make> </kdevautoproject> <kdevdebugger> <general> <dbgshell>libtool</dbgshell> <programargs/> <gdbpath/> <configGdbScript/> <runShellScript/> <runGdbScript/> <breakonloadinglibs>true</breakonloadinglibs> <separatetty>false</separatetty> <floatingtoolbar>false</floatingtoolbar> </general> <display> <staticmembers>false</staticmembers> <demanglenames>true</demanglenames> <outputradix>16</outputradix> </display> </kdevdebugger> <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> <toc>bash</toc> <toc>bash_bugs</toc> <toc>clanlib</toc> <toc>fortran_bugs_gcc</toc> <toc>gnome1</toc> <toc>gnustep</toc> <toc>gtk</toc> <toc>gtk_bugs</toc> <toc>haskell</toc> <toc>haskell_bugs_ghc</toc> <toc>java_bugs_gcc</toc> <toc>java_bugs_sun</toc> <toc>kde2book</toc> <toc>opengl</toc> <toc>pascal_bugs_fp</toc> <toc>php</toc> <toc>php_bugs</toc> <toc>perl</toc> <toc>perl_bugs</toc> <toc>python</toc> <toc>python_bugs</toc> <toc>qt-kdev3</toc> <toc>ruby</toc> <toc>ruby_bugs</toc> <toc>sdl</toc> <toc>sw</toc> <toc>w3c-dom-level2-html</toc> <toc>w3c-svg</toc> <toc>w3c-uaag10</toc> <toc>wxwidgets_bugs</toc> </ignoretocs> <ignoreqt_xml> <toc>Guide to the Qt Translation Tools</toc> <toc>Qt Assistant Manual</toc> <toc>Qt Designer Manual</toc> <toc>Qt Reference Documentation</toc> <toc>qmake User Guide</toc> </ignoreqt_xml> <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> </kdevdoctreeview> <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> </kdevfilecreate> <cppsupportpart> <filetemplates> <interfacesuffix>.h</interfacesuffix> <implementationsuffix>.cpp</implementationsuffix> </filetemplates> </cppsupportpart> <kdevcppsupport> <codecompletion> <includeGlobalFunctions>true</includeGlobalFunctions> <includeTypes>true</includeTypes> <includeEnums>true</includeEnums> <includeTypedefs>true</includeTypedefs> <automaticCodeCompletion>true</automaticCodeCompletion> <automaticArgumentsHint>true</automaticArgumentsHint> <automaticHeaderCompletion>true</automaticHeaderCompletion> <codeCompletionDelay>250</codeCompletionDelay> <argumentsHintDelay>400</argumentsHintDelay> <headerCompletionDelay>250</headerCompletionDelay> </codecompletion> <references/> </kdevcppsupport> <kdevdocumentation> <projectdoc> <docsystem/> <docurl/> <usermanualurl/> </projectdoc> </kdevdocumentation> <kdevfileview> <groups> <hidenonprojectfiles>false</hidenonprojectfiles> <hidenonlocation>false</hidenonlocation> </groups> <tree> <hidepatterns>*.o,*.lo,CVS</hidepatterns> <hidenonprojectfiles>false</hidenonprojectfiles> </tree> </kdevfileview> </kdevelop> Index: configure.in =================================================================== RCS file: /cvsroot/seq/showeq/configure.in,v retrieving revision 1.49.4.16 retrieving revision 1.49.4.17 diff -u -d -r1.49.4.16 -r1.49.4.17 --- configure.in 25 Sep 2004 20:37:27 -0000 1.49.4.16 +++ configure.in 7 Nov 2004 23:09:53 -0000 1.49.4.17 @@ -2,12 +2,25 @@ dnl $Id$ $Name$ AC_PREREQ(2.53) -AC_INIT(src/main.cpp) +AC_INIT(showeq, 5.0.0.16) +AC_CONFIG_SRCDIR(src/main.cpp) AC_CANONICAL_SYSTEM + AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(showeq, 5.0.0.15) +AM_INIT_AUTOMAKE(1.7) AM_MAINTAINER_MODE +dnl doxygen macros +DX_HTML_FEATURE(ON) +DX_CHM_FEATURE(OFF) +DX_CHI_FEATURE(OFF) +DX_MAN_FEATURE(OFF) +DX_RTF_FEATURE(OFF) +DX_XML_FEATURE(OFF) +DX_PDF_FEATURE(OFF) +DX_PS_FEATURE(OFF) +DX_INIT_DOXYGEN(ShowEQ, doxygen.cfg, dox) + dnl Use CCd/CXXd rather than CC/CXX otherwise it cache's the value dnl and prevents the alternate search from working. Would be better dnl if there was someway to invalidate the cache entry. ?? Index: ChangeLog =================================================================== RCS file: /cvsroot/seq/showeq/Attic/ChangeLog,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- ChangeLog 25 Sep 2004 20:37:27 -0000 1.1.2.2 +++ ChangeLog 7 Nov 2004 23:09:52 -0000 1.1.2.3 @@ -1,5 +1,51 @@ Version: $Id$ $Name$ + +dohpaZ (11/7/04) +------------------------ ++ Updated version to 5.0.0.16 +dohpaZ (11/6/04) +------------------------ ++ Minor 64-bit compatibility cleanup. ++ Cleaned up some minor warnings under gcc 3.4.2. + +dophaZ (10/27/04) +------------------------ ++ Applied patch #1047554 "Oct13 struct patch" created by codepig666 and + submitted to the Patches tracker by tanner (Basic). + +dohpaZ (10/2/04) +------------------------ ++ Migrate to new (autoconf >2.50) style AC_INIT & AM_INIT_AUTOMAKE ++ Update INSTALL to reflect new minimum automake 1.7 requirement for + Makefile.dist users. ++ Exclude MOC output files m_*.cpp from Doxygen processing. ++ Removed QT_VERSION checks that for versions of Qt that we no longer + support (Qt 2.x, 3.0.x) to improve code readability/maintainability. ++ Improved MOC file handling. ++ Miscellaneous cleanup. + +dohpaZ (10/1/04) +------------------------ ++ Integrated patch #'s: 1037498, 1037496, 1037494, 1037493, 1037491 + "Doxygen support for autoconf/automake" from tanner(Basic) ++ Added minor Doxygen related tweaks to source. ++ Added automatic Qt tag file generation for use with doxygen, along with + a doxygen-installdox rule to build the html dox and link them to + trolltech's website. ++ Minor bug fix related to a recently integrated patch. ++ Some more robustness modifications. ++ Fixed a minor warning. + +dohpaZ (09/29/04) +------------------------ ++ More kdevelop project related tweaks. ++ Added Doxyfile for DOxygen related configuration. + +dophaZ (09/27/04) +------------------------ ++ Added kdevelop project. + dophaZ (09/25/04) ------------------------ + Fixed some more gcc 3.4 warnings. @@ -8,6 +54,7 @@ dophaZ (09/24/04) ------------------------ ++ Updated version to 5.0.0.15 + Migrated the dominant distribution method of ShowEQ to tarballs and packages. Support for direct building off of CVS by non-developers, although still supported, is deprecated and strongly discouraged. Index: acinclude.m4 =================================================================== RCS file: /cvsroot/seq/showeq/acinclude.m4,v retrieving revision 1.9.16.3 retrieving revision 1.9.16.4 diff -u -d -r1.9.16.3 -r1.9.16.4 --- acinclude.m4 24 Sep 2004 04:25:41 -0000 1.9.16.3 +++ acinclude.m4 7 Nov 2004 23:09:53 -0000 1.9.16.4 @@ -582,15 +582,18 @@ ac_qt_includes="" ac_qt_libraries="" ac_qt_bindir="" +ac_qt_docs="" qt_libraries="" qt_includes="" +qt_docs="" AC_ARG_WITH(qt-dir, [ --with-qt-dir=DIR where the root of Qt is installed ], [ ac_qt_includes="$withval"/include ac_qt_libraries="$withval"/lib ac_qt_bindir="$withval"/bin + ac_qt_docs="$withval"/doc/html ]) AC_ARG_WITH(qt-includes, @@ -599,6 +602,12 @@ ac_qt_includes="$withval" ]) +AC_ARG_WITH(qt-docs, + [ --with-qt-docs=DIR where the Qt docs are. ], + [ + ac_qt_docs="$withval" + ]) + ac_qt_libs_given=no AC_ARG_WITH(qt-libraries, @@ -622,41 +631,31 @@ $QTINC \ /usr/local/qt3/include \ /usr/local/qt/include \ - /usr/local/qt2/include \ - /usr/local/qt-2.3.2/include \ /usr/local/qt*/include \ - /opt/qt-gcc3-2.3.2/include \ + /usr/qt/3/include \ + /usr/qt/*/include \ /opt/qt-gcc3-*/include \ - /opt/qt-2.3.2/include \ /usr/include/qt3 \ /usr/include/qt \ - /usr/include/qt2 \ /usr/include/qt* \ /usr/include \ /usr/lib/qt3/include \ /usr/lib/qt/include \ - /usr/lib/qt2/include \ /usr/lib/qt*/include \ - /usr/lib/qtgcc3-2.3.2/include \ /usr/lib/qtgcc3-*/include \ /usr/lib/qt3/include \ /usr/lib/qt/include \ - /usr/lib/qt2/include \ /usr/lib/qt*/include \ - /usr/X11R6/include/X11/qt2 \ /usr/X11R6/include/X11/qt3 \ /usr/X11R6/include/X11/qt \ /usr/X11R6/include/X11/qt* \ - /usr/X11R6/include/X11/qt2/include \ /usr/X11R6/include/X11/qt3/include \ /usr/X11R6/include/X11/qt/include \ /usr/X11R6/include/X11/qt*/include \ - /usr/X11R6/include/qt2 \ /usr/X11R6/include/qt3 \ /usr/X11R6/include/qt \ /usr/X11R6/include/qt* \ - /usr/X11R6/include/qt2/include \ - /usr/X11R6/include/qt3/include \ + /usr/X11R6/include/qt3/include \ /usr/X11R6/include/qt/include \ /usr/X11R6/include/qt*/include \ /usr/src/qt-*/include \ @@ -738,36 +737,27 @@ $QTLIB \ /usr/local/qt3/lib \ /usr/local/qt/lib \ - /usr/local/qt2/lib \ - /usr/local/qt-2.3.2/lib \ /usr/local/qt*/lib \ - /opt/qt-gcc3-2.3.2/lib \ - /opt/qt-2.3.2/lib \ + /usr/qt/3/lib \ + /usr/qt/*/lib \ /usr/lib/qt3/lib \ /usr/lib/qt/lib \ /usr/lib/qt*/lib \ /usr/lib/qt3 \ - /usr/lib/qt2 \ /usr/lib/qt \ - /usr/lib/qt2/lib \ - /usr/lib/qtgcc3-2.3.2/lib \ /usr/lib/qt* \ /usr/lib \ /usr/X11R6/lib/X11/qt3 \ /usr/X11R6/lib/X11/qt \ - /usr/X11R6/lib/X11/qt2 \ /usr/X11R6/lib/X11/qt* \ /usr/X11R6/lib/X11/qt3/lib \ /usr/X11R6/lib/X11/qt/lib \ - /usr/X11R6/lib/X11/qt2/lib \ /usr/X11R6/lib/X11/qt*/lib \ /usr/X11R6/lib/qt3 \ /usr/X11R6/lib/qt \ - /usr/X11R6/lib/qt2 \ /usr/X11R6/lib/qt* \ /usr/X11R6/lib/qt3/lib \ /usr/X11R6/lib/qt/lib \ - /usr/X11R6/lib/qt2/lib \ /usr/X11R6/lib/qt*/lib \ /usr/src/qt-*/lib \ $x_libraries \ @@ -788,7 +778,6 @@ else echo "tried $dir" >&AC_FD_CC; fi - done ac_qt_libraries="$qt_libdir" @@ -845,6 +834,53 @@ LIBS="$ac_libs_safe" AC_LANG_RESTORE + +dnl ************************************ +dnl * Build yet another search path... * +dnl ************************************ + +qt_docdirs=" $QTDIR/doc/html \ + $qt_incdir../doc/html \ + /usr/local/qt3/doc/html \ + /usr/local/qt/doc/html \ + /usr/local/qt*/doc/html \ + /usr/qt/3/doc/html \ + /usr/qt/*/doc/html \ + /usr/lib/qt3/doc/html \ + /usr/lib/qt/doc/html \ + /usr/lib/qt*/doc/html \ + /usr/lib/doc/html \ + /usr/lib/qt/doc/html \ + /usr/lib/qt*/doc/html \ + /usr/X11R6/lib/X11/qt3/doc/html \ + /usr/X11R6/lib/X11/qt/doc/html \ + /usr/X11R6/lib/X11/qt*/doc/html \ + /usr/X11R6/lib/X11/qt3/doc/html \ + /usr/X11R6/lib/X11/qt/doc/html \ + /usr/X11R6/lib/X11/qt*/doc/html \ + /usr/X11R6/lib/qt3/doc/html \ + /usr/X11R6/lib/qt/doc/html \ + /usr/X11R6/lib/qt*/doc/html \ + /usr/X11R6/lib/qt3/doc/html \ + /usr/X11R6/lib/qt/doc/html \ + /usr/X11R6/lib/qt*/doc/html \ + /usr/src/qt-*/doc/html \ + $qt_docdirs" + +[[ "$ac_qt_docs" != "NO" ]] && \ +qt_docdirs="$ac_qt_docs $qt_docdirs" + +AC_FIND_FILE("qobject.html", $qt_docdirs, qt_docdir) + +ac_qt_docs="$qt_docdir" + +if [[ -n "$ac_qt_docs" -a "$ac_qt_docs" != "NO" ]]; then + echo -e ">>>> Documentation...:\t$ac_qt_docs/" +else + echo -e ">>>> Documentation...:\tUnable to locate?!?" + AC_MSG_WARN([Qt documenation not installed?!]); +fi; + if [[ -z "$ac_qt_includes" ]] || [[ -z "$ac_qt_libraries" ]]; then ac_cv_have_qt="have_qt=no"; ac_qt_notfound=""; @@ -900,6 +936,7 @@ qt_libraries=$ac_qt_libraries qt_includes=$ac_qt_includes + qt_docs=$ac_qt_docs else @@ -914,6 +951,7 @@ qt_libraries=$ac_qt_libraries qt_includes=$ac_qt_includes + qt_docs=$ac_qt_docs fi @@ -923,6 +961,7 @@ AC_SUBST(qt_libraries) AC_SUBST(qt_includes) +AC_SUBST(qt_docs) if [[ "$qt_includes" == "$x_includes" ]] || [[ -z "$qt_includes" ]]; then @@ -940,8 +979,11 @@ all_libraries="$all_libraries $QT_LDFLAGS" fi +QT_DOCS="$qt_docs" + AC_SUBST(QT_INCLUDES) AC_SUBST(QT_LDFLAGS) +AC_SUBST(QT_DOCS) LIB_QT='-lqt-mt $(LIBPNG) -lXext $(LIB_X11) $(X_PRE_LIBS)' AC_SUBST(LIB_QT) --- NEW FILE: doxygen.am --- # Copyright (C) 2004 Oren Ben-Kiki # This file is distributed under the same terms as the Automake macro files. # Generate automatic documentation using Doxygen. Goals and variables values # are controlled by the various DX_COND_??? conditionals set by autoconf. # # The provided goals are: # doxygen-doc: Generate all doxygen documentation. # doxygen-run: Run doxygen, which will generate some of the documentation # (HTML, CHM, CHI, MAN, RTF, XML) but will not do the post # processing required for the rest of it (PS, PDF, and some MAN). # doxygen-man: Rename some doxygen generated man pages. # doxygen-ps: Generate doxygen PostScript documentation. # doxygen-pdf: Generate doxygen PDF documentation. # # Note that by default these are not integrated into the automake goals. If # doxygen is used to generate man pages, you can achieve this integration by # setting man3_MANS to the list of man pages generated and then adding the # dependency: # # $(man3_MANS): doxygen-doc # # This will cause make to run doxygen and generate all the documentation. # # The following variable is intended for use in Makefile.am: # # DX_CLEANFILES = everything to clean. # # This is usually added to MOSTLYCLEANFILES. ## --------------------------------- ## ## Format-independent Doxygen rules. ## ## --------------------------------- ## if DX_COND_doc ## ------------------------------- ## ## Rules specific for HTML output. ## ## ------------------------------- ## if DX_COND_html DX_CLEAN_HTML = @DX_DOCDIR@/html endif DX_COND_html ## ------------------------------ ## ## Rules specific for CHM output. ## ## ------------------------------ ## if DX_COND_chm DX_CLEAN_CHM = @DX_DOCDIR@/chm if DX_COND_chi DX_CLEAN_CHI = @DX_DOCDIR@/@PACKAGE@.chi endif DX_COND_chi endif DX_COND_chm ## ------------------------------ ## ## Rules specific for MAN output. ## ## ------------------------------ ## if DX_COND_man DX_CLEAN_MAN = @DX_DOCDIR@/man endif DX_COND_man ## ------------------------------ ## ## Rules specific for RTF output. ## ## ------------------------------ ## if DX_COND_rtf DX_CLEAN_RTF = @DX_DOCDIR@/rtf endif DX_COND_rtf ## ------------------------------ ## ## Rules specific for XML output. ## ## ------------------------------ ## if DX_COND_xml DX_CLEAN_XML = @DX_DOCDIR@/xml endif DX_COND_xml ## ----------------------------- ## ## Rules specific for PS output. ## ## ----------------------------- ## if DX_COND_ps DX_CLEAN_PS = @DX_DOCDIR@/@PACKAGE@.ps DX_PS_GOAL = doxygen-ps doxygen-ps: @DX_DOCDIR@/@PACKAGE@.ps @DX_DOCDIR@/@PACKAGE@.ps: @DX_DOCDIR@/@PACKAGE@.tag cd @DX_DOCDIR@/latex; \ rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \ $(DX_LATEX) refman.tex; \ $(MAKEINDEX_PATH) refman.idx; \ $(DX_LATEX) refman.tex; \ countdown=5; \ while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \ refman.log > /dev/null 2>&1 \ && test $$countdown -gt 0; do \ $(DX_LATEX) refman.tex; \ countdown=`expr $$countdown - 1`; \ done; \ $(DX_DVIPS) -o ../@PACKAGE@.ps refman.dvi endif DX_COND_ps ## ------------------------------ ## ## Rules specific for PDF output. ## ## ------------------------------ ## if DX_COND_pdf DX_CLEAN_PDF = @DX_DOCDIR@/@PACKAGE@.pdf DX_PDF_GOAL = doxygen-pdf doxygen-pdf: @DX_DOCDIR@/@PACKAGE@.pdf @DX_DOCDIR@/@PACKAGE@.pdf: @DX_DOCDIR@/@PACKAGE@.tag cd @DX_DOCDIR@/latex; \ rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \ $(DX_PDFLATEX) refman.tex; \ $(DX_MAKEINDEX) refman.idx; \ $(DX_PDFLATEX) refman.tex; \ countdown=5; \ while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \ refman.log > /dev/null 2>&1 \ && test $$countdown -gt 0; do \ $(DX_PDFLATEX) refman.tex; \ countdown=`expr $$countdown - 1`; \ done; \ mv refman.pdf ../@PACKAGE@.pdf endif DX_COND_pdf ## ------------------------------------------------- ## ## Rules specific for LaTeX (shared for PS and PDF). ## ## ------------------------------------------------- ## if DX_COND_latex DX_CLEAN_LATEX = @DX_DOCDIR@/latex endif DX_COND_latex .PHONY: doxygen-run doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL) .INTERMEDIATE: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL) doxygen-run: @DX_DOCDIR@/@PACKAGE@.tag doxygen-doc: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL) @DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS) rm -rf @DX_DOCDIR@ $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG) DX_CLEANFILES = \ @DX_DOCDIR@/@PACKAGE@.tag \ -r \ $(DX_CLEAN_HTML) \ $(DX_CLEAN_CHM) \ $(DX_CLEAN_CHI) \ $(DX_CLEAN_MAN) \ $(DX_CLEAN_RTF) \ $(DX_CLEAN_XML) \ $(DX_CLEAN_PS) \ $(DX_CLEAN_PDF) \ $(DX_CLEAN_LATEX) endif DX_COND_doc Index: Makefile.am =================================================================== RCS file: /cvsroot/seq/showeq/Makefile.am,v retrieving revision 1.1.1.1.16.1 retrieving revision 1.1.1.1.16.2 diff -u -d -r1.1.1.1.16.1 -r1.1.1.1.16.2 --- Makefile.am 24 Sep 2004 04:25:41 -0000 1.1.1.1.16.1 +++ Makefile.am 7 Nov 2004 23:09:53 -0000 1.1.1.1.16.2 @@ -1,12 +1,29 @@ -AUTOMAKE_OPTIONS = dist-bzip2 +ACLOCAL_AMFLAGS = -I m4 +AUTOMAKE_OPTIONS = 1.7 dist-bzip2 SUBDIRS = src conf -EXTRA_DIST = BUGS ChangeLog FAQ INSTALL.newbies Makefile.dist README.libEQ ROADMAP showeq.1 TODO +include doxygen.am -MAINTAINERCLEANFILES = aclocal.m4 config.guess config.sub configure Makefile.in \ -ltconfig libqt2.dbg libqt3.dbg Makefile.dist.dbg configure.dbg config.log \ -ltmain.sh stamp-h.in stamp-h +EXTRA_DIST = BUGS ChangeLog FAQ INSTALL.newbies Makefile.dist README.libEQ \ +ROADMAP showeq.1 TODO showeq.kdevelop Doxyfile $(DX_CONFIG) + +MAINTAINERCLEANFILES = aclocal.m4 config.guess config.sub configure \ +Makefile.in ltconfig libqt2.dbg libqt3.dbg Makefile.dist.dbg \ +configure.dbg config.log ltmain.sh stamp-h.in stamp-h qt.tag + +@DX_DOCDIR@/@PACKAGE@.tag: qt.tag + +qt.tag: $(QT_DOCS)/index.html $(QT_DOCS)/qobject.html + doxytag -t qt.tag $(QT_DOCS) + +doxygen-installdox: doxygen-doc dox/html/installdox + if [ -x "@DX_DOCDIR@/html/installdox" ]; then \ + cd @DX_DOCDIR@/html; \ + ./installdox -l qt.tag@http://doc.trolltech.com/3.3/ -q; \ + fi + +MOSTLYCLEANFILES = $(DX_CLEANFILES) CLEANFILES = configure.dbg libqt2.dbg libqt3.dbg Index: INSTALL =================================================================== RCS file: /cvsroot/seq/showeq/INSTALL,v retrieving revision 1.5.16.4 retrieving revision 1.5.16.5 diff -u -d -r1.5.16.4 -r1.5.16.5 --- INSTALL 24 Sep 2004 04:25:41 -0000 1.5.16.4 +++ INSTALL 7 Nov 2004 23:09:53 -0000 1.5.16.5 @@ -285,7 +285,7 @@ *** GNU tools *** libtool 1.3.4-3 Most recent... http://www.gnu.org/software/libtool/ autoconf 2.53 Most recent... http://www.gnu.org/software/autoconf/ - automake 1.5 Most recent... http://www.gnu.org/software/automake/ + automake 1.7 Most recent... http://www.gnu.org/software/automake/ perl 5.0 Most recent... http://www.perl.org/ --------------------------------------------------------------------------- --- NEW FILE: doxygen.cfg --- # Doxyfile 1.3.7 #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = $(PROJECT)-$(VERSION) PROJECT_NUMBER = OUTPUT_DIRECTORY = $(DOCDIR) CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English USE_WINDOWS_ENCODING = NO BRIEF_MEMBER_DESC = YES REPEAT_BRIEF = YES ABBREVIATE_BRIEF = "The $name class" \ "The $name widget" \ "The $name file" \ is \ provides \ specifies \ contains \ represents \ a \ an \ the ALWAYS_DETAILED_SEC = NO INLINE_INHERITED_MEMB = NO STRIP_FROM_INC_PATH = $(SRCDIR) FULL_PATH_NAMES = YES STRIP_FROM_PATH = $(SRCDIR) SHORT_NAMES = NO JAVADOC_AUTOBRIEF = YES MULTILINE_CPP_IS_BRIEF = NO DETAILS_AT_TOP = YES INHERIT_DOCS = YES DISTRIBUTE_GROUP_DOC = NO TAB_SIZE = 8 ALIASES = OPTIMIZE_OUTPUT_FOR_C = YES OPTIMIZE_OUTPUT_JAVA = NO SUBGROUPING = YES #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- EXTRACT_ALL = YES EXTRACT_PRIVATE = NO EXTRACT_STATIC = NO EXTRACT_LOCAL_CLASSES = YES EXTRACT_LOCAL_METHODS = NO HIDE_UNDOC_MEMBERS = NO HIDE_UNDOC_CLASSES = NO HIDE_FRIEND_COMPOUNDS = NO HIDE_IN_BODY_DOCS = NO INTERNAL_DOCS = NO CASE_SENSE_NAMES = YES HIDE_SCOPE_NAMES = NO SHOW_INCLUDE_FILES = YES INLINE_INFO = YES SORT_MEMBER_DOCS = YES SORT_BRIEF_DOCS = NO SORT_BY_SCOPE_NAME = NO GENERATE_TODOLIST = YES GENERATE_TESTLIST = YES GENERATE_BUGLIST = YES GENERATE_DEPRECATEDLIST= YES ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 30 SHOW_USED_FILES = YES #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- QUIET = YES WARNINGS = YES WARN_IF_UNDOCUMENTED = YES WARN_IF_DOC_ERROR = YES WARN_FORMAT = "$file:$line: $text" WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- INPUT = $(SRCDIR) FILE_PATTERNS = *.c \ *.cpp \ *.c++ \ *.inl \ *.h \ *.inc RECURSIVE = YES EXCLUDE = m_*.cpp EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = EXAMPLE_PATH = $(SRCDIR) EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = NO IMAGE_PATH = INPUT_FILTER = FILTER_SOURCE_FILES = NO #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- SOURCE_BROWSER = YES INLINE_SOURCES = NO STRIP_CODE_COMMENTS = YES REFERENCED_BY_RELATION = YES REFERENCES_RELATION = YES VERBATIM_HEADERS = YES #--------------------------------------------------------------------------- # configuration options related to the alphabetical class index #--------------------------------------------------------------------------- ALPHABETICAL_INDEX = YES COLS_IN_ALPHA_INDEX = 5 IGNORE_PREFIX = #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- GENERATE_HTML = $(GENERATE_HTML) HTML_OUTPUT = html HTML_FILE_EXTENSION = .html HTML_HEADER = HTML_FOOTER = HTML_STYLESHEET = HTML_ALIGN_MEMBERS = YES GENERATE_HTMLHELP = $(GENERATE_CHM) CHM_FILE = ../$(PROJECT).chm HHC_LOCATION = $(HHC_PATH) GENERATE_CHI = $(GENERATE_CHI) BINARY_TOC = NO TOC_EXPAND = NO DISABLE_INDEX = NO ENUM_VALUES_PER_LINE = 4 GENERATE_TREEVIEW = YES TREEVIEW_WIDTH = 250 #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- GENERATE_LATEX = $(GENERATE_LATEX) LATEX_OUTPUT = latex LATEX_CMD_NAME = latex MAKEINDEX_CMD_NAME = makeindex COMPACT_LATEX = NO PAPER_TYPE = $(PAPER_SIZE) EXTRA_PACKAGES = LATEX_HEADER = PDF_HYPERLINKS = NO USE_PDFLATEX = NO LATEX_BATCHMODE = YES LATEX_HIDE_INDICES = NO #--------------------------------------------------------------------------- # configuration options related to the RTF output #--------------------------------------------------------------------------- GENERATE_RTF = $(GENERATE_RTF) RTF_OUTPUT = rtf COMPACT_RTF = NO RTF_HYPERLINKS = NO RTF_STYLESHEET_FILE = RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- GENERATE_MAN = $(GENERATE_MAN) MAN_OUTPUT = man MAN_EXTENSION = .1 MAN_LINKS = NO #--------------------------------------------------------------------------- # configuration options related to the XML output #--------------------------------------------------------------------------- GENERATE_XML = $(GENERATE_XML) XML_OUTPUT = xml XML_SCHEMA = XML_DTD = XML_PROGRAMLISTING = YES #--------------------------------------------------------------------------- # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- GENERATE_AUTOGEN_DEF = NO #--------------------------------------------------------------------------- # configuration options related to the Perl module output #--------------------------------------------------------------------------- GENERATE_PERLMOD = NO PERLMOD_LATEX = NO PERLMOD_PRETTY = YES PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- # Configuration options related to the preprocessor #--------------------------------------------------------------------------- ENABLE_PREPROCESSING = YES MACRO_EXPANSION = NO EXPAND_ONLY_PREDEF = NO SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = PREDEFINED = DOXYGEN_SHOULD_SKIP_THIS EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- # Configuration::additions related to external references #--------------------------------------------------------------------------- TAGFILES = $(SRCDIR)/qt.tag GENERATE_TAGFILE = $(DOCDIR)/$(PROJECT).tag ALLEXTERNALS = NO EXTERNAL_GROUPS = YES PERL_PATH = $(PERL_PATH) #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- CLASS_DIAGRAMS = YES HIDE_UNDOC_RELATIONS = YES HAVE_DOT = $(HAVE_DOT) CLASS_GRAPH = YES COLLABORATION_GRAPH = YES UML_LOOK = YES TEMPLATE_RELATIONS = YES INCLUDE_GRAPH = YES INCLUDED_BY_GRAPH = YES CALL_GRAPH = NO GRAPHICAL_HIERARCHY = YES DOT_IMAGE_FORMAT = png DOT_PATH = $(DOT_PATH) DOTFILE_DIRS = MAX_DOT_GRAPH_WIDTH = 1024 MAX_DOT_GRAPH_HEIGHT = 1024 MAX_DOT_GRAPH_DEPTH = 1000 GENERATE_LEGEND = YES DOT_CLEANUP = YES #--------------------------------------------------------------------------- # Configuration::additions related to the search engine #--------------------------------------------------------------------------- SEARCHENGINE = YES --- showeq.kdevprj DELETED --- Index: AUTHORS =================================================================== RCS file: /cvsroot/seq/showeq/Attic/AUTHORS,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- AUTHORS 24 Sep 2004 04:25:41 -0000 1.1.2.1 +++ AUTHORS 7 Nov 2004 23:09:51 -0000 1.1.2.2 @@ -17,5 +17,6 @@ ROADMAP Zaphod TODO Zaphod BUGS Zaphod +m4/doxygen.m4 Oren Ben-Kiki <or...@be...> |