development / crossrootfs.git / blame
| Commit | Line | Data |
|---|---|---|
| ef6cbccb VM |
1 | commit 9bb54267a1483e8f3b2de352c7be433f625e5606 |
| 2 | Author: Martin Pitt <martin.pitt@ubuntu.com> | |
| 3 | Date: Thu Mar 31 19:23:19 2011 +0200 | |
| 4 | ||
| 5 | Revert "Do not build extras with --disable-extras" | |
| 6 | ||
| 7 | This reverts commit 905818f5961446ac32d1b2d165185fffddc4915a. | |
| 8 | ||
| 9 | We do want to build some extras, just not the ones with extra dependencies. | |
| 10 | Thanks to Juergen Daubert for pointing this out. | |
| 11 | ||
| 12 | diff --git a/Makefile.am b/Makefile.am | |
| 13 | index df70bf7..2c20f46 100644 | |
| 14 | --- a/Makefile.am | |
| 15 | +++ b/Makefile.am | |
| 16 | @@ -225,7 +225,6 @@ dist_udevrules_DATA += \ | |
| 17 | extras/rule_generator/75-cd-aliases-generator.rules \ | |
| 18 | extras/rule_generator/75-persistent-net-generator.rules | |
| 19 | ||
| 20 | -if ENABLE_EXTRAS | |
| 21 | # ------------------------------------------------------------------------------ | |
| 22 | # firmware - firmware loading | |
| 23 | # ------------------------------------------------------------------------------ | |
| 24 | @@ -314,8 +313,6 @@ extras_v4l_id_v4l_id_LDADD = libudev/libudev-private.la | |
| 25 | libexec_PROGRAMS += extras/v4l_id/v4l_id | |
| 26 | dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules | |
| 27 | ||
| 28 | -endif # ENABLE_EXTRAS | |
| 29 | - | |
| 30 | # ------------------------------------------------------------------------------ | |
| 31 | # qemu -- qemu/kvm guest tweaks | |
| 32 | # ------------------------------------------------------------------------------ |