Makefile.am: Install cilk.h.

2014-03-09  Tobias Burnus  <burnus@net-b.de>

        * Makefile.am: Install cilk.h.
        * Makefile.in: Regenerate.
        * aclocal.m4: Regenerate.

From-SVN: r208440

diff --git a/libcilkrts/ChangeLog b/libcilkrts/ChangeLog
index 434b974d635c5d2aa726fd1a3c709e2e4d2e36e9..5b4938c51a1c32d2f58533997b5749037902a6a5 100644 (file)
--- a/libcilkrts/ChangeLog
+++ b/libcilkrts/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-09  Tobias Burnus  <burnus@net-b.de>
+
+       * Makefile.am: Install cilk.h.
+       * Makefile.in: Regenerate.
+       * aclocal.m4: Regenerate.
+
 2014-02-18  Balaji V. Iyer  <balaji.v.iyer@intel.com>
 
        * include/cilk/common.h (__CILKRTS_ABI_VERSION): Set the ABI version

diff --git a/libcilkrts/Makefile.am b/libcilkrts/Makefile.am
index f2d13aabd88308796addd44d25ccdf3bd6cc02cf..e902f7379105529d611d2afe2c07fb09ff4f0e66 100644 (file)
--- a/libcilkrts/Makefile.am
+++ b/libcilkrts/Makefile.am
@@ -50,8 +50,11 @@ AM_LDFLAGS = -lpthread
 # May be used by toolexeclibdir.
 gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
 
+cilkincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/cilk
+
 # Target list.
 toolexeclib_LTLIBRARIES = libcilkrts.la
+nodist_cilkinclude_HEADERS = include/cilk/cilk.h
 
 libcilkrts_la_SOURCES =            \
   runtime/config/$(config_dir)/cilk-abi-vla.c           \

diff --git a/libcilkrts/Makefile.in b/libcilkrts/Makefile.in
index 092e2f706ec413a836c6bdd9b2b38fd8e96107c3..706a0da81391422b94cb60c38b2ef7dac1e32f9c 100644 (file)
--- a/libcilkrts/Makefile.in
+++ b/libcilkrts/Makefile.in
@@ -122,10 +122,8 @@ DIST_COMMON = $(srcdir)/include/internal/rev.mk README ChangeLog \
 @MAC_LINKER_SCRIPT_TRUE@am__append_2 = -Wl,-exported_symbols_list,$(srcdir)/runtime/mac-symbols.txt
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
-       $(top_srcdir)/../config/depstand.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
        $(top_srcdir)/../config/lead-dot.m4 \
-       $(top_srcdir)/../config/libstdc++-raw-cxx.m4 \
        $(top_srcdir)/../config/multi.m4 \
        $(top_srcdir)/../config/override.m4 \
        $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
@@ -160,7 +158,7 @@ am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(toolexeclibdir)" \
-       "$(DESTDIR)$(cilkincludedir)"
+       "$(DESTDIR)$(cilkincludedir)" "$(DESTDIR)$(cilkincludedir)"
 LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
 libcilkrts_la_LIBADD =
 am_libcilkrts_la_OBJECTS = cilk-abi-vla.lo os-unix-sysdep.lo bug.lo \
@@ -204,7 +202,7 @@ MULTIDIRS =
 MULTISUBDIR = 
 MULTIDO = true
 MULTICLEAN = true
-HEADERS = $(cilkinclude_HEADERS)
+HEADERS = $(cilkinclude_HEADERS) $(nodist_cilkinclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 ACLOCAL = @ACLOCAL@
@@ -245,8 +243,6 @@ LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
-LIBSTDCXX_RAW_CXX_CXXFLAGS = @LIBSTDCXX_RAW_CXX_CXXFLAGS@
-LIBSTDCXX_RAW_CXX_LDFLAGS = @LIBSTDCXX_RAW_CXX_LDFLAGS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
@@ -328,7 +324,6 @@ sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
-target_noncanonical = @target_noncanonical@
 target_os = @target_os@
 target_vendor = @target_vendor@
 toolexecdir = @toolexecdir@
@@ -355,8 +350,13 @@ AM_LDFLAGS = -lpthread
 # May be used by toolexeclibdir.
 gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
 
+# C/C++ header files for Cilk.
+# cilkincludedir = $(includedir)/cilk
+cilkincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include/cilk
+
 # Target list.
 toolexeclib_LTLIBRARIES = libcilkrts.la
+nodist_cilkinclude_HEADERS = include/cilk/cilk.h
 libcilkrts_la_SOURCES = \
   runtime/config/$(config_dir)/cilk-abi-vla.c           \
   runtime/config/$(config_dir)/os-unix-sysdep.c \
@@ -399,10 +399,6 @@ CILK_REVISION = 3902
 libcilkrts_la_LDFLAGS = -version-info 5:0:0 -lpthread \
        @lt_cv_dlopen_libs@ $(am__append_1) $(am__append_2) \
        -no-undefined
-
-# C/C++ header files for Cilk.
-# cilkincludedir = $(includedir)/cilk
-cilkincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include/cilk
 cilkinclude_HEADERS = \
   include/cilk/cilk_api.h          \
   include/cilk/cilk_api_linux.h    \
@@ -873,6 +869,26 @@ uninstall-cilkincludeHEADERS:
        test -n "$$files" || exit 0; \
        echo " ( cd '$(DESTDIR)$(cilkincludedir)' && rm -f" $$files ")"; \
        cd "$(DESTDIR)$(cilkincludedir)" && rm -f $$files
+install-nodist_cilkincludeHEADERS: $(nodist_cilkinclude_HEADERS)
+       @$(NORMAL_INSTALL)
+       test -z "$(cilkincludedir)" || $(MKDIR_P) "$(DESTDIR)$(cilkincludedir)"
+       @list='$(nodist_cilkinclude_HEADERS)'; test -n "$(cilkincludedir)" || list=; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(cilkincludedir)'"; \
+         $(INSTALL_HEADER) $$files "$(DESTDIR)$(cilkincludedir)" || exit $$?; \
+       done
+
+uninstall-nodist_cilkincludeHEADERS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(nodist_cilkinclude_HEADERS)'; test -n "$(cilkincludedir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(cilkincludedir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(cilkincludedir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -929,7 +945,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) all-multi $(HEADERS)
 installdirs:
-       for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(cilkincludedir)"; do \
+       for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(cilkincludedir)" "$(DESTDIR)$(cilkincludedir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-am
@@ -981,7 +997,8 @@ info: info-am
 
 info-am:
 
-install-data-am: install-cilkincludeHEADERS
+install-data-am: install-cilkincludeHEADERS \
+       install-nodist_cilkincludeHEADERS
 
 install-dvi: install-dvi-am
 
@@ -1030,6 +1047,7 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-cilkincludeHEADERS \
+       uninstall-nodist_cilkincludeHEADERS \
        uninstall-toolexeclibLTLIBRARIES
 
 .MAKE: all-multi clean-multi distclean-multi install-am install-multi \
@@ -1043,14 +1061,17 @@ uninstall-am: uninstall-cilkincludeHEADERS \
        install-am install-cilkincludeHEADERS install-data \
        install-data-am install-dvi install-dvi-am install-exec \
        install-exec-am install-html install-html-am install-info \
-       install-info-am install-man install-multi install-pdf \
-       install-pdf-am install-ps install-ps-am install-strip \
+       install-info-am install-man install-multi \
+       install-nodist_cilkincludeHEADERS install-pdf install-pdf-am \
+       install-ps install-ps-am install-strip \
        install-toolexeclibLTLIBRARIES installcheck installcheck-am \
        installdirs maintainer-clean maintainer-clean-generic \
        maintainer-clean-multi mostlyclean mostlyclean-compile \
        mostlyclean-generic mostlyclean-libtool mostlyclean-multi pdf \
        pdf-am ps ps-am tags uninstall uninstall-am \
-       uninstall-cilkincludeHEADERS uninstall-toolexeclibLTLIBRARIES
+       uninstall-cilkincludeHEADERS \
+       uninstall-nodist_cilkincludeHEADERS \
+       uninstall-toolexeclibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

diff --git a/libcilkrts/aclocal.m4 b/libcilkrts/aclocal.m4
index c24d0b604153d9362d1f82bcb31f4438a849e17c..68107caffa075b0a8a198f60a0e1ee574eb6d58d 100644 (file)
--- a/libcilkrts/aclocal.m4
+++ b/libcilkrts/aclocal.m4
@@ -968,10 +968,8 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([../config/acx.m4])
 m4_include([../config/depstand.m4])
 m4_include([../config/lead-dot.m4])
-m4_include([../config/libstdc++-raw-cxx.m4])
 m4_include([../config/multi.m4])
 m4_include([../config/override.m4])
 m4_include([../libtool.m4])