diff options
| author | Richard Hughes <richard@hughsie.com> | 2017-07-24 16:23:42 +0100 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2017-07-24 16:25:10 +0100 |
| commit | 9235b120fc0ec33ef13a04d54c403285dae49cb3 (patch) | |
| tree | 7115acfce5200e850d698abb1134e4f19bb5296a | |
| parent | 0957e6538a6d62f3d7b5a11e549360c34e5d82e8 (diff) | |
| download | colord-9235b120fc0ec33ef13a04d54c403285dae49cb3.tar.gz | |
Do not build the examples as part of the regular build
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | examples/Makefile.am | 30 |
4 files changed, 1 insertions, 47 deletions
diff --git a/Makefile.am b/Makefile.am index e4b1557..e3b21bf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,8 +12,7 @@ SUBDIRS = \ SUBDIRS += \ client \ contrib \ - doc \ - examples + doc # this needs client/cd-create-profile SUBDIRS += \ @@ -53,7 +53,6 @@ Compiling for Microsoft Windows mingw64-configure \ --disable-argyllcms-sensor \ --disable-bash-completion \ - --disable-examples \ --disable-polkit \ --disable-print-profiles \ --disable-sane \ diff --git a/configure.ac b/configure.ac index a21cc93..023e592 100644 --- a/configure.ac +++ b/configure.ac @@ -254,19 +254,6 @@ AC_ARG_WITH([udevrulesdir], AC_SUBST([udevrulesdir], [$with_udevrulesdir]) dnl --------------------------------------------------------------------------- -dnl - Build DBus examples -dnl --------------------------------------------------------------------------- -AC_ARG_ENABLE(examples, AS_HELP_STRING([--enable-examples],[enable DBus example code]), - enable_examples=$enableval,enable_examples=yes) -AM_CONDITIONAL(CD_BUILD_EXAMPLES, test x$enable_examples = xyes) -if test x$enable_examples = xyes; then - PKG_CHECK_MODULES(DBUS, dbus-1, have_dbus=yes, have_dbus=no) - if test x$have_dbus = xno ; then - AC_MSG_ERROR([DBus examples require dbus-1 package, not found]) - fi -fi - -dnl --------------------------------------------------------------------------- dnl - Build ArgyllCMS sensor dnl --------------------------------------------------------------------------- AC_ARG_ENABLE(argyllcms-sensor, AS_HELP_STRING([--enable-argyllcms-sensor],[enable ArgllCMS sensor]), @@ -390,7 +377,6 @@ Makefile contrib/Makefile contrib/session-helper/Makefile contrib/colord-sane/Makefile -examples/Makefile man/Makefile doc/Makefile doc/api/Makefile diff --git a/examples/Makefile.am b/examples/Makefile.am deleted file mode 100644 index 4df697b..0000000 --- a/examples/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -AM_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) - -if CD_BUILD_EXAMPLES -noinst_PROGRAMS = \ - cd-dbus-create-device \ - cd-dbus-use-qualifier - -cd_dbus_create_device_SOURCES = \ - cd-dbus-create-device.c - -cd_dbus_create_device_LDADD = \ - $(GLIB_LIBS) \ - $(DBUS_LIBS) - -cd_dbus_create_device_CFLAGS = \ - $(WARN_CFLAGS) - -cd_dbus_use_qualifier_SOURCES = \ - cd-dbus-use-qualifier.c - -cd_dbus_use_qualifier_LDADD = \ - $(DBUS_LIBS) - -cd_dbus_use_qualifier_CFLAGS = \ - $(WARN_CFLAGS) -endif - --include $(top_srcdir)/git.mk |