From: Bruno Haible Date: Sat, 13 Apr 2019 09:03:25 +0000 (+0200) Subject: openmp-init: New module. X-Git-Tag: v1.0~4984 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=ced06e07937781dcebe74847cd0901bac8291d54;p=gnulib.git openmp-init: New module. * modules/openmp-init: New file. * modules/openmp: (Files, Depends-on, configure.ac, Makefile.am): Revert the changes from 2019-04-09. --- diff --git a/ChangeLog b/ChangeLog index 641224193e..469003a5b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2019-04-13 Bruno Haible + + openmp-init: New module. + * modules/openmp-init: New file. + * modules/openmp: (Files, Depends-on, configure.ac, Makefile.am): Revert + the changes from 2019-04-09. + 2019-04-12 Bruno Haible signbit: Fix compilation error when gnulib's math.h exists twice. diff --git a/modules/openmp b/modules/openmp index ef8e605fe8..7c627ed649 100644 --- a/modules/openmp +++ b/modules/openmp @@ -2,38 +2,13 @@ Description: Detection of OpenMP support. Files: -lib/omp.in.h -lib/omp-init.c -m4/omp_h.m4 Depends-on: -include_next -c-ctype -setenv configure.ac: AC_OPENMP -gl_OMP_H Makefile.am: -BUILT_SOURCES += omp.h - -# We need the following in order to create when the system -# doesn't have one that works with the given compiler. -omp.h: omp.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ - $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_OMP_H''@|$(NEXT_OMP_H)|g' \ - < $(srcdir)/omp.in.h; \ - } > $@-t && \ - mv $@-t $@ -MOSTLYCLEANFILES += omp.h omp.h-t -lib_SOURCES += omp-init.c Include: #ifdef _OPENMP diff --git a/modules/openmp-init b/modules/openmp-init new file mode 100644 index 0000000000..e3975ca473 --- /dev/null +++ b/modules/openmp-init @@ -0,0 +1,47 @@ +Description: +Initialization of OpenMP support. + +Files: +lib/omp.in.h +lib/omp-init.c +m4/omp_h.m4 + +Depends-on: +include_next +c-ctype +setenv + +configure.ac: +gl_OMP_H + +Makefile.am: +BUILT_SOURCES += omp.h + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +omp.h: omp.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ + $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_OMP_H''@|$(NEXT_OMP_H)|g' \ + < $(srcdir)/omp.in.h; \ + } > $@-t && \ + mv $@-t $@ +MOSTLYCLEANFILES += omp.h omp.h-t + +lib_SOURCES += omp-init.c + +Include: +#ifdef _OPENMP +# include +#endif + +License: +LGPL + +Maintainer: +all