Merge branch 'master' into autotools-conversion

cde/programs/dthelp/parser/pass2/htag2/Imakefile

@@ -38,9 +38,9 @@ APPLHDRS = $(PARSEHDRS) $(ELTHDRS) \
         ../parser/pval.h ../parser/globdec.h ../parser/signonx.h \
         ../parser/userinc.h
 
-SRCS =  custom.c sdl.c option.c out.c $(XLATESRCS)
+SRCS =  custom.c global.c sdl.c option.c out.c $(XLATESRCS)
 
-OBJS =  custom.o sdl.o option.o out.o $(XLATEOBJS)
+OBJS =  custom.o global.o sdl.o option.o out.o $(XLATEOBJS)
 
 LOCAL_LIBRARIES = $(SDLUTILLIB)
 

cde/programs/dthelp/parser/pass2/htag2/global.c

@@ -0,0 +1,48 @@
+/*
+ * CDE - Common Desktop Environment
+ *
+ * Copyright (c) 1993-2012, The Open Group. All rights reserved.
+ *
+ * These libraries and programs are free software; you can
+ * redistribute them and/or modify them under the terms of the GNU
+ * Lesser General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * These libraries and programs are distributed in the hope that
+ * they will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with these libraries and programs; if not, write
+ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+ * Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "basic.h"
+#include "trie.h"
+#include "common.h"
+
+#include "global.h"
+
+
+/*
+ * Names for all the input, output and intermediate files we'll need.
+*/
+char *inFileName;
+char *outFileName;
+char *errFileName;
+char *idxFileName;
+char *snbFileName;
+char *sortedIdxFileName;
+char *tossFileName;
+char *vstructFileName;
+char *tempFileName;
+char *compFileName;
+char *compZFileName;
+
+FILE *inFile;
+FILE *outFile;
+

cde/programs/dthelp/parser/pass2/htag2/global.h

@@ -128,20 +128,20 @@ EXTERN char *progName          INIT(NULL);
 /*
  * Names for all the input, output and intermediate files we'll need.
 */
-char *inFileName;
-char *outFileName;
-char *errFileName;
-char *idxFileName;
-char *snbFileName;
-char *sortedIdxFileName;
-char *tossFileName;
-char *vstructFileName;
-char *tempFileName;
-char *compFileName;
-char *compZFileName;
+extern char *inFileName;
+extern char *outFileName;
+extern char *errFileName;
+extern char *idxFileName;
+extern char *snbFileName;
+extern char *sortedIdxFileName;
+extern char *tossFileName;
+extern char *vstructFileName;
+extern char *tempFileName;
+extern char *compFileName;
+extern char *compZFileName;
 
-FILE *inFile;
-FILE *outFile;
+extern FILE *inFile;
+extern FILE *outFile;
 
 typedef struct _loidsRec *LoidsPtr;
 typedef struct _loidsRec {

cde/programs/dthelp/parser/pass2/parser/Imakefile

@@ -37,6 +37,7 @@ XLATEOBJECTS = $(HTAG2SRC)/LocaleXlate.o $(HTAG2SRC)/XlationSvc.o
 
 APPLOBJECTS = \
 	$(HTAG2SRC)/custom.o \
+	$(HTAG2SRC)/global.o \
 	$(HTAG2SRC)/sdl.o    \
 	$(HTAG2SRC)/option.o \
 	$(HTAG2SRC)/out.o    \