From 43d0c30bf0b4cf722aa0debb12c552f822387f4c Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 4 Oct 2007 12:26:38 +0200 Subject: [PATCH] Adapt to new gnulib naming scheme. * gl/lib/se-context.in.h: Rename from gl/lib/se-context_.h. * gl/lib/se-selinux.in.h: Rename from gl/lib/se-selinux_.h. * gl/m4/selinux-context-h.m4: Remove use of AC_LIBSOURCES. * gl/m4/selinux-selinux-h.m4: Likewise. * gl/modules/selinux-h (Files, Makefile.am): Reflect renaming. (Makefile.am) [lib_SOURCES]: Add se-context.in.h and se-selinux.in.h. --- ChangeLog | 8 ++++++++ gl/lib/{se-context_.h => se-context.in.h} | 0 gl/lib/{se-selinux_.h => se-selinux.in.h} | 0 gl/m4/selinux-context-h.m4 | 3 +-- gl/m4/selinux-selinux-h.m4 | 3 +-- gl/modules/selinux-h | 14 ++++++++------ 6 files changed, 18 insertions(+), 10 deletions(-) rename gl/lib/{se-context_.h => se-context.in.h} (100%) rename gl/lib/{se-selinux_.h => se-selinux.in.h} (100%) diff --git a/ChangeLog b/ChangeLog index be6ad619b..b63a4aea3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2007-10-04 Jim Meyering + Adapt to new gnulib naming scheme. + * gl/lib/se-context.in.h: Rename from gl/lib/se-context_.h. + * gl/lib/se-selinux.in.h: Rename from gl/lib/se-selinux_.h. + * gl/m4/selinux-context-h.m4: Remove use of AC_LIBSOURCES. + * gl/m4/selinux-selinux-h.m4: Likewise. + * gl/modules/selinux-h (Files, Makefile.am): Reflect renaming. + (Makefile.am) [lib_SOURCES]: Add se-context.in.h and se-selinux.in.h. + * lib/search_.h: Remove unused file. * bootstrap (slurp): Adapt to _.h -> .in.h name change. diff --git a/gl/lib/se-context_.h b/gl/lib/se-context.in.h similarity index 100% rename from gl/lib/se-context_.h rename to gl/lib/se-context.in.h diff --git a/gl/lib/se-selinux_.h b/gl/lib/se-selinux.in.h similarity index 100% rename from gl/lib/se-selinux_.h rename to gl/lib/se-selinux.in.h diff --git a/gl/m4/selinux-context-h.m4 b/gl/m4/selinux-context-h.m4 index 4011dde2a..269c15230 100644 --- a/gl/m4/selinux-context-h.m4 +++ b/gl/m4/selinux-context-h.m4 @@ -1,5 +1,5 @@ # serial 1 -*- Autoconf -*- -# Copyright (C) 2006 Free Software Foundation, Inc. +# Copyright (C) 2006, 2007 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -9,7 +9,6 @@ AC_DEFUN([gl_HEADERS_SELINUX_CONTEXT_H], [ - AC_LIBSOURCES([se-context_.h]) # Check for , AC_CHECK_HEADERS([selinux/context.h], [SELINUX_CONTEXT_H=], diff --git a/gl/m4/selinux-selinux-h.m4 b/gl/m4/selinux-selinux-h.m4 index 13ce2ac9a..822ffa209 100644 --- a/gl/m4/selinux-selinux-h.m4 +++ b/gl/m4/selinux-selinux-h.m4 @@ -1,5 +1,5 @@ # serial 1 -*- Autoconf -*- -# Copyright (C) 2006 Free Software Foundation, Inc. +# Copyright (C) 2006, 2007 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -9,7 +9,6 @@ AC_DEFUN([gl_HEADERS_SELINUX_SELINUX_H], [ - AC_LIBSOURCES([se-selinux_.h]) # Check for , AC_CHECK_HEADERS([selinux/selinux.h], [SELINUX_SELINUX_H=], diff --git a/gl/modules/selinux-h b/gl/modules/selinux-h index 915b9d276..97a70c998 100644 --- a/gl/modules/selinux-h +++ b/gl/modules/selinux-h @@ -2,8 +2,8 @@ Description: SELinux-related headers for systems that lack them. Files: -lib/se-context_.h -lib/se-selinux_.h +lib/se-context.in.h +lib/se-selinux.in.h m4/selinux-context-h.m4 m4/selinux-selinux-h.m4 @@ -14,18 +14,20 @@ gl_HEADERS_SELINUX_SELINUX_H gl_HEADERS_SELINUX_CONTEXT_H Makefile.am: +lib_SOURCES += se-context.in.h se-selinux.in.h + BUILT_SOURCES += $(SELINUX_SELINUX_H) -selinux/selinux.h: se-selinux_.h +selinux/selinux.h: se-selinux.in.h mkdir -p selinux - cp $(srcdir)/se-selinux_.h $@-t + cp $(srcdir)/se-selinux.in.h $@-t chmod a-x $@-t mv $@-t $@ MOSTLYCLEANFILES += selinux/selinux.h selinux/selinux.h-t BUILT_SOURCES += $(SELINUX_CONTEXT_H) -selinux/context.h: se-context_.h +selinux/context.h: se-context.in.h mkdir -p selinux - cp $(srcdir)/se-context_.h $@-t + cp $(srcdir)/se-context.in.h $@-t chmod a-x $@-t mv $@-t $@ MOSTLYCLEANFILES += selinux/context.h selinux/context.h-t