diff --git a/checkpolicy/Makefile.am b/checkpolicy/Makefile.am index fdc936e..3534673 100644 --- a/checkpolicy/Makefile.am +++ b/checkpolicy/Makefile.am @@ -1,4 +1,6 @@ -bin_PROGRAMS = checkmodule checkpolicy $(extras) +SUBDIRS = test +bin_PROGRAMS = checkmodule checkpolicy + checkmodule_SOURCES = $(COMMONSRC) checkmodule.c checkmodule_DEPENDENCIES= $(LIBSEPOL_A_PATH) checkmodule_LDADD = $(LIBSEPOL_A_PATH) @@ -12,12 +14,9 @@ AM_LDFLAGS = -Wl,--as-needed COMMONSRC = \ queue.c module_compiler.c \ parse_util.c policy_define.c \ - policy_parse.y policy_scan.l + policy_parse.y policy_scan.l \ + module_compiler.h y.tab.h y.tab.c : policy_parse.y $(YACC) -d $< -extras = -if BUILD_tests -extras += dispol dismod -endif diff --git a/checkpolicy/configure.ac b/checkpolicy/configure.ac index 7a484a4..27e4473 100644 --- a/checkpolicy/configure.ac +++ b/checkpolicy/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([checkpolicy], VERSION, BUG-REPORT-ADDRESS) +AC_INIT([checkpolicy], VERSION, selinux@tycho.nsa.gov) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([module_compiler.h]) AC_CONFIG_HEADER([config.h]) @@ -85,7 +85,7 @@ AC_ARG_ENABLE([tests], [enable_tests=no] ) -AM_CONDITIONAL([BUILD_tests],[test "$enable_tests]" = "yes"]) +AM_CONDITIONAL([BUILD_tests],[test "$enable_tests" = "yes"]) # Checks for header files. AC_HEADER_STDC @@ -114,7 +114,14 @@ AC_FUNC_MMAP AC_FUNC_REALLOC AC_CHECK_FUNCS([memset strcasecmp strchr strdup strerror strtol strtoul]) -AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([Makefile test/Makefile]) + +# Pickup the version info from the source directory if available +VERSION=`cat $srcdir/VERSION` +if test "$VERSION" = "" ; then + VERSION=git +fi + AC_OUTPUT PRINT='echo -n -e ' diff --git a/checkpolicy/test/Makefile.am b/checkpolicy/test/Makefile.am new file mode 100644 index 0000000..34bccc5 --- /dev/null +++ b/checkpolicy/test/Makefile.am @@ -0,0 +1,9 @@ +noinst_PROGRAMS = $(c_extras) +c_extras = +if BUILD_tests +c_extras += dispol dismod +endif + +dispol_LDADD = $(LIBSEPOL_A_PATH) +dismod_LDADD = $(LIBSEPOL_A_PATH) +AM_LDFLAGS = -lselinux diff --git a/libselinux/configure.ac b/libselinux/configure.ac index a437404..daa7607 100644 --- a/libselinux/configure.ac +++ b/libselinux/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([libselinux], [VERSION], BUG-REPORT-ADDRESS) +AC_INIT([libselinux], VERSION, selinux@tycho.nsa.gov) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([utils/compute_create.c]) AC_CONFIG_HEADER([config.h]) @@ -199,9 +199,10 @@ AC_CONFIG_FILES([Makefile man/Makefile include/Makefile]) +# Pickup the version info from the source directory if available VERSION=`cat $srcdir/VERSION` if test "$VERSION" = "" ; then - VERSION=svn + VERSION=git fi AC_OUTPUT diff --git a/libsemanage/configure.ac b/libsemanage/configure.ac index 1b70dc9..f1a246e 100644 --- a/libsemanage/configure.ac +++ b/libsemanage/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT(libsemanage, VERSION, BUG-REPORT-ADDRESS) +AC_INIT(libsemanage, VERSION, selinux@tycho.nsa.gov) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([src/modules.c]) AC_CONFIG_HEADER([config.h]) @@ -151,10 +151,10 @@ AC_CONFIG_FILES([Makefile include/Makefile man/Makefile]) - +# Pickup the version info from the source directory if available VERSION=`cat $srcdir/VERSION` if test "$VERSION" = "" ; then - VERSION=svn + VERSION=git fi AC_OUTPUT diff --git a/libsepol/src/Makefile.am b/libsepol/src/Makefile.am index 55c8d8e..ec74fec 100644 --- a/libsepol/src/Makefile.am +++ b/libsepol/src/Makefile.am @@ -4,24 +4,15 @@ COMMONSRC = assertion.c conditional.c ebitmap.c hashtab.c \ module.c policydb_convert.c services.c util.c \ avtab.c context.c genbools.c iface_record.c \ node_record.c policydb_public.c sidtab.c write.c \ - boolean_record.c context_record.c genusers.c interfaces.c \ - nodes.c port_record.c symtab.c booleans.c \ - debug.c handle.c link.c polcaps.c ports.c user_record.c \ - av_permissions.h \ - boolean_internal.h \ - context.h \ - context_internal.h \ - debug.h \ - dso.h \ - handle.h \ - iface_internal.h \ - mls.h \ - module_internal.h \ - node_internal.h \ - policydb_internal.h \ - port_internal.h \ - private.h \ - user_internal.h + boolean_record.c context_record.c genusers.c \ + interfaces.c nodes.c port_record.c symtab.c \ + booleans.c debug.c handle.c link.c polcaps.c \ + ports.c user_record.c av_permissions.h \ + boolean_internal.h context.h context_internal.h \ + debug.h dso.h handle.h iface_internal.h mls.h \ + module_internal.h node_internal.h policydb_internal.h \ + port_internal.h private.h user_internal.h + lib_LTLIBRARIES = libsepol.la libsepol_la_SOURCES = $(COMMONSRC) libsepol_la_CPPFLAGS = \ diff --git a/policycoreutils/configure.ac b/policycoreutils/configure.ac index 36df796..25fd761 100644 --- a/policycoreutils/configure.ac +++ b/policycoreutils/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT(policycoreutils, VERSION, BUG-REPORT-ADDRESS) +AC_INIT(policycoreutils, VERSION, selinux@tycho.nsa.gov) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([run_init/run_init.c]) AC_CONFIG_HEADER([config.h]) @@ -219,10 +219,10 @@ AC_CONFIG_FILES([ setfiles/Makefile Makefile]) - +# Pickup the version info from the source directory if available VERSION=`cat $srcdir/VERSION` if test "$VERSION" = "" ; then - VERSION=svn + VERSION=git fi AC_OUTPUT diff --git a/sepolgen/configure.ac b/sepolgen/configure.ac index 894f338..d4a61d0 100644 --- a/sepolgen/configure.ac +++ b/sepolgen/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT(sepolgen, VERSION, BUG-REPORT-ADDRESS) +AC_INIT(sepolgen, VERSION, selinux@tycho.nsa.gov) AM_INIT_AUTOMAKE @@ -29,10 +29,10 @@ AC_CONFIG_FILES([Makefile src/share/Makefile]) - +# Pickup the version info from the source directory if available VERSION=`cat $srcdir/VERSION` if test "$VERSION" = "" ; then - VERSION=svn + VERSION=git fi AC_OUTPUT