Skip to content

Commit

Permalink
Second step of revamping the build system
Browse files Browse the repository at this point in the history
The original Makefile.am was drawn to the top level.  This commit
breaks it out into the various directories with SUBDIRS connecting
them.  This makes each directory easier to maintain.
  • Loading branch information
blueness committed Nov 16, 2012
1 parent b7b2cc2 commit c47f33a
Show file tree
Hide file tree
Showing 30 changed files with 169,875 additions and 618 deletions.
620 changes: 3 additions & 617 deletions Makefile.am

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ aclocal && \
autoheader && \
autoconf && \
libtoolize --copy && \
gtkdocize --docdir docs && \
automake --add-missing --copy
23 changes: 22 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ AC_PROG_MAKE_SET

AC_PATH_PROG([M4], [m4])
AC_PATH_PROG([XSLTPROC], [xsltproc])
GTK_DOC_CHECK([1.18],[--flavour no-tmpl])

# TODO check this --- we don't want kmod necessarily
# PKG_CHECK_MODULES(KMOD, [libkmod >= 5])
Expand Down Expand Up @@ -108,6 +109,14 @@ AS_IF([test "x$with_python" != "xno"], [
])
AM_CONDITIONAL([HAVE_PYTHON_DEVEL], [test "$have_python_devel" = "yes"])

# ------------------------------------------------------------------------------

have_introspection=no
AC_ARG_ENABLE([introspection],
[AS_HELP_STRING([--without-introspection], [Disable man page index and systemd-python (default: no)])])
GOBJECT_INTROSPECTION_CHECK([1.31.1])
AM_CONDITIONAL([HAVE_INTROSPECTION], [test "$have_introspection" = "yes"])

# ------------------------------------------------------------------------------
have_selinux=no
AC_ARG_ENABLE(selinux, AS_HELP_STRING([--disable-selinux], [Disable optional SELINUX support]))
Expand Down Expand Up @@ -242,6 +251,18 @@ AC_SUBST([rootlibdir], [$with_rootlibdir])
# ------------------------------------------------------------------------------

AC_CONFIG_FILES([Makefile
docs/Makefile
docs/gudev/Makefile
docs/libudev/Makefile])
docs/libudev/Makefile
hwdb/Makefile
keymaps-force-release/Makefile
keymaps/Makefile
man/Makefile
rules/Makefile
src/Makefile
src/gudev/Makefile
src/libudev/Makefile
src/test/Makefile
src/udev/Makefile
test/Makefile])
AC_OUTPUT
8 changes: 8 additions & 0 deletions docs/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
if ENABLE_GUDEV
SUBDIRS = \
libudev
if ENABLE_GTK_DOC
SUBDIRS += \
gudev
endif
endif
Loading

0 comments on commit c47f33a

Please sign in to comment.