diff options
| author | Johnathan Corgan | 2009-10-07 09:11:13 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2009-10-07 09:11:13 -0700 |
| commit | 30e016dd9cf7c148d3119f01ba7dd4d6474efa50 (patch) | |
| tree | 6369c975e668d9b205dad6b4f683c04e3a79ca13 | |
| parent | 3a7863d31c47442a4691a8af781f87e2890f4aee (diff) | |
| download | gnuradio-30e016dd9cf7c148d3119f01ba7dd4d6474efa50.tar.gz gnuradio-30e016dd9cf7c148d3119f01ba7dd4d6474efa50.tar.bz2 gnuradio-30e016dd9cf7c148d3119f01ba7dd4d6474efa50.zip | |
Applied patch from Don Ward for Cygwin platform
Add *.exe to .gitignore
Restore ac_compiler in gr_fortran.m4 even when no Fortran was found
Add $(NO_UNDEFINED) to LDFLAGS in atsc Makefile.am, so shared libraries
will be built
Change the order of searching pmt/libpmt-qa.la and libgruel.la in gruel
Makefile.am so references to libgruel from limpmt-qa will be resolved
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | config/gr_fortran.m4 | 2 | ||||
| -rw-r--r-- | gr-atsc/src/lib/Makefile.am | 6 | ||||
| -rw-r--r-- | gruel/src/lib/Makefile.am | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index b333709ee..5461bf8bf 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ *.lo *.py[oc] *.gz +*.exe *.patch *~ \#*# diff --git a/config/gr_fortran.m4 b/config/gr_fortran.m4 index a558b2f7e..031052043 100644 --- a/config/gr_fortran.m4 +++ b/config/gr_fortran.m4 @@ -28,6 +28,6 @@ AC_DEFUN([GR_FORTRAN],[ then AC_PROG_F77 AC_F77_LIBRARY_LDFLAGS - AC_PROG_CC dnl bux fix to restore $ac_ext fi + AC_PROG_CC dnl bux fix to restore $ac_ext ]) diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am index b43546125..8aeb80c0a 100644 --- a/gr-atsc/src/lib/Makefile.am +++ b/gr-atsc/src/lib/Makefile.am @@ -92,6 +92,9 @@ BUILT_SOURCES = \ libgnuradio_atsc_la_LIBADD = \ $(GNURADIO_CORE_LA) +libgnuradio_atsc_la_LDFLAGS = \ + $(NO_UNDEFINED) + noinst_LTLIBRARIES = libgnuradio-atsc-qa.la libgnuradio_atsc_qa_la_SOURCES = \ @@ -113,6 +116,9 @@ libgnuradio_atsc_qa_la_SOURCES = \ libgnuradio_atsc_qa_la_LIBADD = \ $(GNURADIO_CORE_LA) +libgnuradio_atsc_qa_la_LDFLAGS = \ + $(NO_UNDEFINED) + # These headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ diff --git a/gruel/src/lib/Makefile.am b/gruel/src/lib/Makefile.am index 9afa0d292..b21f8023c 100644 --- a/gruel/src/lib/Makefile.am +++ b/gruel/src/lib/Makefile.am @@ -58,5 +58,5 @@ libgruel_la_LIBADD = \ # ---------------------------------------------------------------- test_gruel_SOURCES = test_gruel.cc -test_gruel_LDADD = libgruel.la pmt/libpmt-qa.la +test_gruel_LDADD = pmt/libpmt-qa.la libgruel.la |