From patchwork Sun Mar 9 06:24:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 328296 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C1A6C2C00B0 for ; Sun, 9 Mar 2014 17:25:04 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:subject:content-type; q= dns; s=default; b=ByFbwvSLdMtcBDzre4veJnIn/KX2EbaGOaMpQsQ1J4diYc DvCcPk04r8HCZ+nxpvta1zX9mFT1mmz0mpxHeKnCQLDy39+uaQCIPhontvFLfNGA 4XN4TaChON6ooKwwDiW5OqdD5/53gDeVV3l5ge7j6rrYxyfXvFAjXXvf6gRqM= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:subject:content-type; s= default; bh=dg0SUKClKMcDDmLHol3HY9kxqWE=; b=VNwoVgjpgfCyQAOZOsXi 0MO/kJss5h/uV/ToROK+wdIUfs+0Ibpk//8sQhvOo0mkmv9xlDFQXBeeGGb87kt+ /PcpogFx8DeyK2qQK8bgp4+FpDC9YzvSlsK7xaHsgYM0rjlL13Y2UnrLms2ybfng FbnisADJTNkqHYhQfqxz+T8= Received: (qmail 5535 invoked by alias); 9 Mar 2014 06:24:55 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 5514 invoked by uid 89); 9 Mar 2014 06:24:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=1.0 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, URIBL_BLACK autolearn=no version=3.3.2 X-HELO: mx02.qsc.de Received: from mx02.qsc.de (HELO mx02.qsc.de) (213.148.130.14) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Sun, 09 Mar 2014 06:24:49 +0000 Received: from tux.net-b.de (port-92-194-14-144.dynamic.qsc.de [92.194.14.144]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx02.qsc.de (Postfix) with ESMTPSA id AD90524D7E; Sun, 9 Mar 2014 07:24:45 +0100 (CET) Message-ID: <531C092D.4050503@net-b.de> Date: Sun, 09 Mar 2014 07:24:45 +0100 From: Tobias Burnus User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: gcc-patches , "Iyer, Balaji V" , Paolo Bonzini , Jakub Jelinek Subject: [Build] libcilkrts/Makefile.am: Install cilk.h The attached patch installs cilk.h such that "#include " works. Bootstrapped on x86-64-gnu-linux. OK for the trunk? (If you wonder about the other changes in the generated-files diff: I think they are due to r205357, where configure.ac changed and configure was regenerated but Makefile.in and aclocal.m4 were not.) Tobias diff --git a/libcilkrts/Makefile.in b/libcilkrts/Makefile.in index 092e2f7..706a0da 100644 --- 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 c24d0b6..68107ca 100644 --- 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])