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.
This commit is contained in:
Jim Meyering 2007-10-04 12:26:38 +02:00
parent a7acdf85e4
commit 43d0c30bf0
6 changed files with 18 additions and 10 deletions

View File

@ -1,5 +1,13 @@
2007-10-04 Jim Meyering <jim@meyering.net>
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.

View File

@ -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 <selinux/context.h>,
AC_CHECK_HEADERS([selinux/context.h],
[SELINUX_CONTEXT_H=],

View File

@ -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 <selinux/selinux.h>,
AC_CHECK_HEADERS([selinux/selinux.h],
[SELINUX_SELINUX_H=],

View File

@ -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