Removed the mergecdocs option - because we always want to merge C docs, to

2004-01-03  Murray Cumming  <murrayc@usa.net>

        * tools/gmmproc.in, pm/WrapParser.pm, DocsParser.pm: Removed the
        mergecdocs option - because we always want to merge C docs, to avoid
        accidental upload of half-complete docs.

1 files changed, 1 insertions, 10 deletions

diff --git a/tools/gmmproc.in b/tools/gmmproc.in
index a2f5ebf0..c21ba62f 100644
--- a/tools/gmmproc.in
+++ b/tools/gmmproc.in
@@ -64,7 +64,6 @@ $main::defsdir = ".";
 $main::source = "";
 $main::debug = 0;
 $main::unwrapped = 1;
-$main::mergecdocs = 0; # e.g. gtk_docs.xml, contain C comments to be added to our generated C++ code.
 
 { # checking the environment for a set variable can trigger a warning
   no warnings;
@@ -87,11 +86,7 @@ $$objWrapParser{source} = $main::source;
 $$objOutputter{source} = $main::source;
 $$objOutputter{destdir} = $ARGV[1];
 
-
-if($main::mergecdocs eq 1)
-{
-  $$objWrapParser{mergecdocs} = 1;
-}
+# Merge the C docs, e.g. gtk_docs.xml
 
 # Suck the whole file into one big string, breaking it into tokens:
 $objWrapParser->read_file($main::srcdir, $main::source);
@@ -206,10 +201,6 @@ sub parse_command_line_args()
       {
         push @main::macrodirs, shift @ARGV;
       }
-      elsif (/^--mergecdocs/)
-      {
-        $main::mergecdocs = 1
-      }
       elsif (/^--unwrapped/)
       {
         $main::unwrapped = 1;