Replaced 'core' with 'main'.

Other minor updates.

diff --git a/doxygen/Makefile b/doxygen/Makefile
index c599c826c4a47e938f55f026c07ca1578d68c450..4da21fa18fb51b8f829d74ac0c0ba4e971803f0a 100644 (file)
--- a/doxygen/Makefile
+++ b/doxygen/Makefile
@@ -1,12 +1,13 @@
+\r
 default: full\r
 \r
 all: full subset\r
-       \r
+\r
 %.tag: %.doxy\r
        doxygen $<\r
 \r
 FULL = \\r
-       core.doxy \\r
+       main.doxy \\r
        math.doxy \\r
        array_cache.doxy \\r
        swrast.doxy \\r
@@ -18,7 +19,7 @@ full: $(FULL:.doxy=.tag)
        $(foreach FILE,$(FULL),doxygen $(FILE);)\r
 \r
 SUBSET = \\r
-       core.doxy \\r
+       main.doxy \\r
        math.doxy \\r
        miniglx.doxy\r
 \r

diff --git a/doxygen/common.doxy b/doxygen/common.doxy
index 284cdc67c3e0fd443f6607d6a0549178facbc229..022085eb4b379c848c0008b2c9ce87902e3b5d3a 100644 (file)
--- a/doxygen/common.doxy
+++ b/doxygen/common.doxy
@@ -23,7 +23,7 @@ PROJECT_NAME           = Mesa
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 5.1
+PROJECT_NUMBER         = 6.1
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

diff --git a/doxygen/core.doxy b/doxygen/core.doxy
deleted file mode 100644 (file)
index bb84bd3..0000000
--- a/doxygen/core.doxy
+++ /dev/null
@@ -1,48 +0,0 @@
-# Doxyfile 0.1
-
-@INCLUDE               = common.doxy
-
-#---------------------------------------------------------------------------
-# General configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME           = "Mesa Core"
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = ../src/mesa/main/
-FILE_PATTERNS          = *.c *.h
-RECURSIVE              = NO
-EXCLUDE                = ../src/glapitemp.h ../src/glapioffsets.h
-EXCLUDE_PATTERNS       = subset_*
-EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       = 
-EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = 
-INPUT_FILTER           = 
-FILTER_SOURCE_FILES    = NO
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-HTML_OUTPUT            = core
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = YES
-EXPAND_ONLY_PREDEF     = YES
-SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = ../include/
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = _HAVE_FULL_GL=1
-EXPAND_AS_DEFINED      = _glthread_DECLARE_STATIC_MUTEX
-SKIP_FUNCTION_MACROS   = YES
-#---------------------------------------------------------------------------
-# Configuration::addtions related to external references   
-#---------------------------------------------------------------------------
-TAGFILES               = tnl_dd.tag=../tnl_dd \
-                        array_cache.tag=../array_cache \
-                         math.tag=../math \
-                         swrast.tag=../swrast \
-                         swrast_setup.tag=../swrast_setup \
-                         tnl.tag=../tnl
-GENERATE_TAGFILE       = core.tag

diff --git a/doxygen/main.doxy b/doxygen/main.doxy
new file mode 100644 (file)
index 0000000..fa0e676
--- /dev/null
+++ b/doxygen/main.doxy
@@ -0,0 +1,48 @@
+# Doxyfile 0.1
+
+@INCLUDE               = common.doxy
+
+#---------------------------------------------------------------------------
+# General configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = "Mesa Core / Main files"
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = ../src/mesa/main/
+FILE_PATTERNS          = *.c *.h
+RECURSIVE              = NO
+EXCLUDE                = ../src/glapitemp.h ../src/glapioffsets.h
+EXCLUDE_PATTERNS       = subset_*
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = 
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+HTML_OUTPUT            = main
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = YES
+EXPAND_ONLY_PREDEF     = YES
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = ../include/
+INCLUDE_FILE_PATTERNS  = 
+PREDEFINED             = _HAVE_FULL_GL=1
+EXPAND_AS_DEFINED      = _glthread_DECLARE_STATIC_MUTEX
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references   
+#---------------------------------------------------------------------------
+TAGFILES               = tnl_dd.tag=../tnl_dd \
+                        array_cache.tag=../array_cache \
+                         math.tag=../math \
+                         swrast.tag=../swrast \
+                         swrast_setup.tag=../swrast_setup \
+                         tnl.tag=../tnl
+GENERATE_TAGFILE       = main.tag