fix installation of certain header files

diff --git a/src/Makefile.am b/src/Makefile.am
index 190a1b1bf24e6606d3538a1ce5dc8e3e93745840..204ea63f85067e2ef24c0342e8541dca03cc2e92 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -107,6 +107,9 @@ install-data-local:
        (echo include/cvc4.h; \
         echo include/cvc4_public.h; \
         echo include/cvc4parser_public.h; \
+        echo util/tls.h; \
+        echo util/integer.h; \
+        echo util/rational.h; \
         find * -name '*.h' | \
                xargs grep -l '^# *include  *"cvc4.*_public\.h"'; \
        (cd "$(srcdir)" && find * -name '*.h' | \
@@ -134,6 +137,9 @@ uninstall-local:
        -(echo include/cvc4.h; \
          echo include/cvc4_public.h; \
          echo include/cvc4parser_public.h; \
+         echo util/tls.h; \
+         echo util/integer.h; \
+         echo util/rational.h; \
          find * -name '*.h' | \
                xargs grep -l '^# *include  *"cvc4.*_public\.h"'; \
        (cd "$(srcdir)" && find * -name '*.h' | \
@@ -155,6 +161,9 @@ mostlyclean-local:
        (echo include/cvc4.h; \
         echo include/cvc4_public.h; \
         echo include/cvc4parser_public.h; \
+        echo util/tls.h; \
+        echo util/integer.h; \
+        echo util/rational.h; \
         find * -name '*.h.fix' | \
                xargs grep -l '^# *include  *<cvc4/cvc4.*_public\.h>' | \
                sed 's,\.fix$$,,'; \

diff --git a/src/util/tls.h.in b/src/util/tls.h.in
index cd89be9d0bd68caef428fed1ca77f840aa30db68..17f1f1d6e01d1a4f7ae8d6ace6b432b816a2fef6 100644 (file)
--- a/src/util/tls.h.in
+++ b/src/util/tls.h.in
@@ -24,8 +24,6 @@
 #ifndef __CVC4__TLS_H
 #define __CVC4__TLS_H
 
-#line 28 "@srcdir@/tls.h.in"
-
 // A bit obnoxious: we have to take varargs to support multi-argument
 // template types in the threadlocals.
 // E.g. "CVC4_THREADLOCAL(hash_set<type, hasher>*)" fails otherwise,