Twist up how package headers are included. Heimdall has a "resolv.conf" that is installed and sometimes is grabbed instead of include/express/resolve.h, so pull the express include directory up a level and refer to headers as, say, "express/resolve.conf".

erikgreenwald · mpictor · commit 5a678d62da52 · 2011-07-09T10:57:48.000-04:00
git-svn-id: https://brlcad.svn.sourceforge.net/svnroot/brlcad/brlcad/trunk/src/other/step@35705 2f96ce8b-6d43-0410-b8df-bffccc660ffb
diff --git a/src/express/Makefile.am b/src/express/Makefile.am
@@ -1,7 +1,7 @@
 lib_LTLIBRARIES = libexpress.la
 noinst_LTLIBRARIES = libexpress_nil.la
 
-AM_CFLAGS = -I$(top_srcdir)/include/express
+AM_CFLAGS = -I$(top_srcdir)/include
 AM_LFLAGS = -l
 
 bin_PROGRAMS = \
diff --git a/src/express/alg.c b/src/express/alg.c
@@ -39,9 +39,9 @@ static char rcsid[] = "$Id: alg.c,v 1.5 1997/01/21 19:19:51 dar Exp $";
  */
 
 #define ALGORITHM_C
-#include "alg.h"
-#include "object.h"
-#include "schema.h"
+#include "express/alg.h"
+#include "express/object.h"
+#include "express/schema.h"
 
 Scope
 ALGcreate(char type)
diff --git a/src/express/caseitem.c b/src/express/caseitem.c
@@ -30,7 +30,7 @@ static char rcsid[] = "$Id: caseitem.c,v 1.3 1997/01/21 19:19:51 dar Exp $";
  */
 
 #define CASE_ITEM_C
-#include "caseitem.h"
+#include "express/caseitem.h"
 
 /*
 ** Procedure:	CASE_ITinitialize
diff --git a/src/express/dict.c b/src/express/dict.c
@@ -34,9 +34,9 @@ static char rcsid[] = "$Id: dict.c,v 1.4 1997/01/21 19:19:51 dar Exp $";
  */
 
 #define DICTIONARY_C
-#include "dict.h"
-#include "object.h"
-#include "expbasic.h"
+#include "express/dict.h"
+#include "express/object.h"
+#include "express/expbasic.h"
 
 static Error	ERROR_duplicate_decl;
 static Error	ERROR_duplicate_decl_diff_file;
diff --git a/src/express/entity.c b/src/express/entity.c
@@ -112,9 +112,9 @@ static char rcsid[] = "$Id: entity.c,v 1.11 1997/01/21 19:19:51 dar Exp $";
  */
 
 #define ENTITY_C
-#include "entity.h"
-#include "express.h"
-#include "object.h"
+#include "express/entity.h"
+#include "express/express.h"
+#include "express/object.h"
 
 /* returns true if variable is declared (or redeclared) directly by entity */
 int
diff --git a/src/express/error.c b/src/express/error.c
@@ -57,16 +57,16 @@ static char rcsid[] = "$Id: error.c,v 1.13 1997/10/23 21:41:44 sauderd Exp $";
 
 #define	ERROR_C
 #include "signal.h"
-#include "error.h"
+#include "express/error.h"
 #include "string.h"
-#include "linklist.h"
+#include "express/linklist.h"
 #ifdef __STDC__
 #include <stdarg.h>
 #else
 #include <varargs.h>
 #endif
 
-#include "express.h"
+#include "express/express.h"
 
 #define ERROR_MAX_ERRORS	100	/* max line-numbered errors */
 #define ERROR_MAX_SPACE		4000	/* max space for line-numbered errors */
diff --git a/src/express/expparse.y b/src/express/expparse.y
@@ -83,13 +83,13 @@ static char rcsid[] = "$Id: expparse.y,v 1.23 1997/11/14 17:09:04 libes Exp $";
  * Initial revision
  */
 
-#include "symbol.h"
-#include "linklist.h"
+#include "express/symbol.h"
+#include "express/linklist.h"
 #include "stack.h"
-#include "express.h"
-#include "schema.h"
-#include "entity.h"
-#include "resolve.h"
+#include "express/express.h"
+#include "express/schema.h"
+#include "express/entity.h"
+#include "express/resolve.h"
 
 extern int print_objects_while_running;
 
diff --git a/src/express/expr.c b/src/express/expr.c
@@ -71,8 +71,8 @@ static char rcsid[] = "$Id: expr.c,v 1.6 1997/01/21 19:19:51 dar Exp $";
  */
 
 #define EXPRESSION_C
-#include "expr.h"
-#include "resolve.h"
+#include "express/expr.h"
+#include "express/resolve.h"
 
 void EXPop_init();
 static Error ERROR_internal_unrecognized_op_in_EXPresolve;
diff --git a/src/express/express.c b/src/express/express.c
@@ -69,17 +69,17 @@ static char rcsid[] = "";
 
 #define	EXPRESS_C
 #include "conf.h"
-#include <basic.h>
+#include "express/basic.h"
 #include <ctype.h>
 #include <pwd.h>
 #include <stdlib.h>
 #include <setjmp.h>
 #include <errno.h>
 
-#include "express.h"
-#include "resolve.h"
+#include "express/express.h"
+#include "express/resolve.h"
 #include "stack.h"
-#include "scope.h"
+#include "express/scope.h"
 
 extern FILE *yyin;
 extern Express yyexpresult;
diff --git a/src/express/expscan.l b/src/express/expscan.l
@@ -104,10 +104,10 @@ static char rcsid[] = "$Id: expscan.l,v 1.12 1997/05/29 20:17:34 sauderd Exp $";
  * 
  */
 
-#include "basic.h"
-#include "error.h"
-#include "lexact.h"
-#include "express.h"
+#include "express/basic.h"
+#include "express/error.h"
+#include "express/lexact.h"
+#include "express/express.h"
 #include "expparse.h"
 
 extern void	yyerror();
diff --git a/src/express/fedex.c b/src/express/fedex.c
@@ -79,9 +79,9 @@ char *FEDEXversion(void)
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
-#include "error.h"
-#include "express.h"
-#include "resolve.h"
+#include "express/error.h"
+#include "express/express.h"
+#include "express/resolve.h"
 
 #ifdef YYDEBUG
 extern int exp_yydebug;
diff --git a/src/express/hash.c b/src/express/hash.c
@@ -107,7 +107,7 @@ static char rcsid[] = "$Id: hash.c,v 1.8 1997/10/22 16:36:49 sauderd Exp $";
 
 #define HASH_C
 #include <stdlib.h>
-#include "hash.h"
+#include "express/hash.h"
 
 /*
 ** Internal routines
diff --git a/src/express/lexact.c b/src/express/lexact.c
@@ -55,16 +55,16 @@ static char rcsid[] = "$Id: lexact.c,v 1.10 1997/09/24 20:05:38 dar Exp $";
 #include <stdlib.h>
 #include <ctype.h>
 /*#include <strings.h>*/
-#include "lexact.h"
+#include "express/lexact.h"
 
 #include "string.h"
-#include "linklist.h"
+#include "express/linklist.h"
 #include "stack.h"
-#include "hash.h"
-#include "express.h"
+#include "express/hash.h"
+#include "express/express.h"
 #include "expparse.h"
-#include "dict.h"
-#include "memory.h"
+#include "express/dict.h"
+#include "express/memory.h"
 
 extern int		yylineno;
 extern FILE*		yyin;
diff --git a/src/express/linklist.c b/src/express/linklist.c
@@ -22,7 +22,7 @@ static char rcsid[] = "$Id: linklist.c,v 1.3 1997/01/21 19:19:51 dar Exp $";
  */
 
 #define LINKED_LIST_C
-#include "linklist.h"
+#include "express/linklist.h"
 
 void
 LISTinitialize(void)
diff --git a/src/express/memory.c b/src/express/memory.c
@@ -36,8 +36,8 @@ Now you can say things like:
 */
 #include <stdlib.h>
 #include <string.h>
-#include "memory.h"
-#include "error.h"
+#include "express/memory.h"
+#include "express/error.h"
 
 /* just in case we are compiling by hand */
 #ifndef ALLOC
diff --git a/src/express/object.c b/src/express/object.c
@@ -23,7 +23,7 @@ static char rcsid[] = "$Id: object.c,v 1.7 1997/01/21 19:19:51 dar Exp $";
 
 #define OBJECT_C
 #include <stdlib.h>
-#include "object.h"
+#include "express/object.h"
 
 /*ARGSUSED*/
 Symbol *
diff --git a/src/express/resolve.c b/src/express/resolve.c
@@ -57,10 +57,10 @@ static char rcsid[] = "$Id: resolve.c,v 1.14 1997/01/21 19:19:51 dar Exp $";
 
 #define RESOLVE_C
 #include <stdlib.h>
-#include "resolve.h"
+#include "express/resolve.h"
 #include "stack.h"
-#include "schema.h"
-#include "express.h"
+#include "express/schema.h"
+#include "express/express.h"
 
 static void ENTITYresolve_subtypes PROTO((Schema));
 static void ENTITYresolve_supertypes PROTO((Entity));
diff --git a/src/express/schema.c b/src/express/schema.c
@@ -46,10 +46,10 @@ static char rcsid[] = "$Id: schema.c,v 1.13 1997/01/21 19:19:51 dar Exp $";
  */
 
 #define SCHEMA_C
-#include "expbasic.h"
-#include "schema.h"
-#include "object.h"
-#include "resolve.h"
+#include "express/expbasic.h"
+#include "express/schema.h"
+#include "express/object.h"
+#include "express/resolve.h"
 
 Symbol *
 RENAME_get_symbol(Generic r)
diff --git a/src/express/scope.c b/src/express/scope.c
@@ -39,8 +39,8 @@ static char rcsid[] = "$Id: scope.c,v 1.9 1997/01/21 19:19:51 dar Exp $";
  */
 
 #define SCOPE_C
-#include "scope.h"
-#include "resolve.h"
+#include "express/scope.h"
+#include "express/resolve.h"
 
 Symbol *
 SCOPE_get_symbol(Generic s)
diff --git a/src/express/stack.h b/src/express/stack.h
@@ -28,7 +28,7 @@
 /* packages used */
 /*****************/
 
-#include "linklist.h"
+#include "express/linklist.h"
 
 /************/
 /* typedefs */
diff --git a/src/express/stmt.c b/src/express/stmt.c
@@ -41,7 +41,7 @@ static char rcsid[] = "$Id: stmt.c,v 1.3 1997/01/21 19:19:51 dar Exp $";
  */
 
 #define STATEMENT_C
-#include "stmt.h"
+#include "express/stmt.h"
 
 Statement 
 STMTcreate(int type)
diff --git a/src/express/symbol.c b/src/express/symbol.c
@@ -35,7 +35,7 @@ static char rcsid[] = "$Id: symbol.c,v 1.6 1997/01/21 19:19:51 dar Exp $";
  */
 
 #define	SYMBOL_C
-#include "symbol.h"
+#include "express/symbol.h"
 
 /*
 ** Procedure:	SYMBOLinitialize
diff --git a/src/express/symlink.c b/src/express/symlink.c
@@ -6,7 +6,7 @@
 #include <sys/param.h>
 #include <stdio.h>
 #include <errno.h>
-#include "express.h"
+#include "express/express.h"
 
 void
 create_links(Express model)
diff --git a/src/express/type.c b/src/express/type.c
@@ -123,7 +123,7 @@ static char rcsid[] = "$Id: type.c,v 1.12 1997/01/21 19:19:51 dar Exp $";
  */
 
 #define TYPE_C
-#include "type.h"
+#include "express/type.h"
 
 static Error ERROR_undefined_tag;
 
diff --git a/src/express/variable.c b/src/express/variable.c
@@ -85,8 +85,8 @@ static char rcsid[] = "$Id: variable.c,v 1.7 1997/01/21 19:19:51 dar Exp $";
 
 #define VARIABLE_C
 #include <stdlib.h>
-#include "variable.h"
-#include "object.h"
+#include "express/variable.h"
+#include "express/object.h"
 
 /*
 ** Procedure:	VAR_create/free/copy/equal
