-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 This patch looks good to me. acked. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk/I/I8ACgkQrlYvE4MpobNcPwCg0sr5WJFVhkT8XX2lsFOBMHlX Fk8AniOoqp5MxNZN75U5E6nWqqkMDmlv =c0TL -----END PGP SIGNATURE-----
>From f46e1e0d51da96892a5de03b86e0d0d6f312be78 Mon Sep 17 00:00:00 2001 From: Eric Paris <eparis@xxxxxxxxxx> Date: Fri, 1 Jun 2012 09:13:24 -0400 Subject: [PATCH 87/90] libselinux: additional makefile support for rubywrap SELinux ruby bindings didn't build from the top level the swig generated .c file wasn't gitignored Signed-off-by: Eric Paris <eparis@xxxxxxxxxx> --- Makefile | 2 +- libselinux/src/.gitignore | 1 + libselinux/src/Makefile | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 09c2c1e..f71faab 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ all install relabel clean test indent: (cd $$subdir && $(MAKE) $@) || exit 1; \ done -install-pywrap swigify: +install-pywrap install-rubywrap swigify: @for subdir in $(PYSUBDIRS); do \ (cd $$subdir && $(MAKE) $@) || exit 1; \ done diff --git a/libselinux/src/.gitignore b/libselinux/src/.gitignore index ff0c7c2..1360380 100644 --- a/libselinux/src/.gitignore +++ b/libselinux/src/.gitignore @@ -1,3 +1,4 @@ selinux.py selinuxswig_wrap.c selinuxswig_python_exception.i +swlinuxswig_ruby_wrap.c diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile index a0840ae..18c02dc 100644 --- a/libselinux/src/Makefile +++ b/libselinux/src/Makefile @@ -166,7 +166,7 @@ relabel: /sbin/restorecon $(SHLIBDIR)/$(LIBSO) clean: - -rm -f $(LIBPC) $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(SWIGLOBJ) $(SWIGSO) $(TARGET) $(AUDIT2WHYSO) *.o *.lo *~ + -rm -f $(LIBPC) $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(SWIGLOBJ) $(SWIGRUBYLOBJ) $(SWIGSO) $(TARGET) $(AUDIT2WHYSO) *.o *.lo *~ distclean: clean rm -f $(GENERATED) $(SWIGFILES) -- 1.7.10.2