|
Revision 7945
(checked in by jcorgan, 10 months ago)
|
Merged changeset r7936:7943 from jcorgan/bc-merge into release branch.
This merges in Michael Dicken's build system updates for ticket:186 into
the release 3.1 branch. It effectively combines changesets r7617, r7631,
r7632, r7769, and r7888 from the trunk.
Merge conflicts resulted from portions of changesets that applied to
files that are not on the release branch, and were manually resolved.
File config/pkg.m4 was copied over from the trunk.
|
- Property svn:eol-style set to
LF
|
| Line | |
|---|
| 1 |
|
|---|
| 2 |
|
|---|
| 3 |
|
|---|
| 4 |
|
|---|
| 5 |
|
|---|
| 6 |
|
|---|
| 7 |
|
|---|
| 8 |
|
|---|
| 9 |
|
|---|
| 10 |
|
|---|
| 11 |
|
|---|
| 12 |
|
|---|
| 13 |
|
|---|
| 14 |
|
|---|
| 15 |
|
|---|
| 16 |
|
|---|
| 17 |
|
|---|
| 18 |
|
|---|
| 19 |
|
|---|
| 20 |
AC_DEFUN([GRC_GNURADIO_EXAMPLES],[ |
|---|
| 21 |
GRC_ENABLE(gnuradio-examples) |
|---|
| 22 |
|
|---|
| 23 |
|
|---|
| 24 |
GRC_CHECK_DEPENDENCY(gnuradio-examples, gnuradio-core) |
|---|
| 25 |
|
|---|
| 26 |
AC_CONFIG_FILES([ \ |
|---|
| 27 |
gnuradio-examples/Makefile \ |
|---|
| 28 |
gnuradio-examples/python/Makefile \ |
|---|
| 29 |
gnuradio-examples/python/apps/hf_explorer/Makefile \ |
|---|
| 30 |
gnuradio-examples/python/apps/hf_radio/Makefile \ |
|---|
| 31 |
gnuradio-examples/python/apps/Makefile \ |
|---|
| 32 |
gnuradio-examples/python/audio/Makefile \ |
|---|
| 33 |
gnuradio-examples/python/digital/Makefile \ |
|---|
| 34 |
gnuradio-examples/python/multi-antenna/Makefile \ |
|---|
| 35 |
gnuradio-examples/python/multi_usrp/Makefile \ |
|---|
| 36 |
gnuradio-examples/python/network/Makefile \ |
|---|
| 37 |
gnuradio-examples/python/usrp/Makefile \ |
|---|
| 38 |
]) |
|---|
| 39 |
|
|---|
| 40 |
GRC_BUILD_CONDITIONAL(gnuradio-examples) |
|---|
| 41 |
]) |
|---|