| 0 | |
Description: fix includepath
|
| 1 | |
Date: Sat Oct 27 14:11:10 2018 +0100
|
| 2 | |
.
|
| 3 | |
augment searchpath
|
| 4 | |
.
|
| 5 | |
admsXml used to drop headers in ${CWD}, and complain.
|
| 6 | |
also it failed to look for headers in the right place.
|
| 7 | |
.
|
| 8 | |
(postpone disabling the header creation.)
|
| 9 | |
.
|
| 10 | |
diff --git a/admsXml/Makefile.am b/admsXml/Makefile.am
|
| 11 | |
index f9cbbc3..d2e96c2 100644
|
| 12 | |
Author: Felix Salfelder <felix@salfelder.org>
|
| 13 | |
--- a/admsXml/Makefile.am
|
| 14 | |
+++ b/admsXml/Makefile.am
|
| 15 | |
@@ -50,6 +50,7 @@ bin_PROGRAMS=admsXml admsCheck
|
| 16 | |
|
| 17 | |
admsXml_SOURCES=admsXml.c
|
| 18 | |
admsXml_LDADD=-lm libadmsElement.la libadmsVeriloga.la libadmsPreprocessor.la libadmsAdmstpath.la
|
| 19 | |
+admsXml_CPPFLAGS=${AM_CPPFLAGS} -DADMS_INCLUDEDIR=\"${pkgincludedir}\"
|
| 20 | |
|
| 21 | |
admsXml.c: adms.implicit.xml.c
|
| 22 | |
|
| 23 | |
diff --git a/admsXml/admsXml.c b/admsXml/admsXml.c
|
| 24 | |
index a618dad..fa15213 100644
|
| 25 | |
--- a/admsXml/admsXml.c
|
| 26 | |
+++ b/admsXml/admsXml.c
|
| 27 | |
@@ -616,6 +616,9 @@ static void parseva (const int argc,const char** argv,char* myverilogamsfile)
|
| 28 | |
adms_slist_push(&pproot()->skipp_text,(p_adms)(long)(0));
|
| 29 | |
pproot()->includePath=getlist_from_argv(argc,argv,"-I","directory");
|
| 30 | |
adms_slist_push(&pproot()->includePath,(p_adms)".");
|
| 31 | |
+#ifdef ADMS_INCLUDEDIR
|
| 32 | |
+ adms_slist_push(&pproot()->includePath,(p_adms)ADMS_INCLUDEDIR);
|
| 33 | |
+#endif
|
| 34 | |
adms_preprocessor_get_define_from_argv(argc,argv);
|
| 35 | |
adms_preprocessor_define_add_default("insideADMS");
|
| 36 | |
adms_message_verbose(("create temporary file %s\n",mytmpverilogamsfile))
|