chiark / gitweb /
Revert "Do not build extras with --disable-extras"
authorMartin Pitt <martin.pitt@ubuntu.com>
Thu, 31 Mar 2011 17:23:19 +0000 (19:23 +0200)
committerMartin Pitt <martin.pitt@ubuntu.com>
Thu, 31 Mar 2011 17:23:19 +0000 (19:23 +0200)
This reverts commit 905818f5961446ac32d1b2d165185fffddc4915a.

We do want to build some extras, just not the ones with extra dependencies.
Thanks to Juergen Daubert for pointing this out.

Makefile.am

index df70bf73be35bb5b592f0816e3e743f256d47371..2c20f46c6df35cf67ff82e6d51e02ba7a1d28634 100644 (file)
@@ -225,7 +225,6 @@ dist_udevrules_DATA += \
        extras/rule_generator/75-cd-aliases-generator.rules \
        extras/rule_generator/75-persistent-net-generator.rules
 
-if ENABLE_EXTRAS
 # ------------------------------------------------------------------------------
 # firmware - firmware loading
 # ------------------------------------------------------------------------------
@@ -314,8 +313,6 @@ extras_v4l_id_v4l_id_LDADD = libudev/libudev-private.la
 libexec_PROGRAMS += extras/v4l_id/v4l_id
 dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules
 
-endif # ENABLE_EXTRAS
-
 # ------------------------------------------------------------------------------
 # qemu -- qemu/kvm guest tweaks
 # ------------------------------------------------------------------------------