summaryrefslogtreecommitdiff
path: root/gnuradio-core
diff options
context:
space:
mode:
authorjcorgan2006-08-03 14:04:22 +0000
committerjcorgan2006-08-03 14:04:22 +0000
commit405a2871f397a175b9aab6cd78e7ad47abe2f36f (patch)
treed60ecebaf27abda99991870e45bf836de0cb42ee /gnuradio-core
parent5d69a524f81f234b3fbc41d49ba18d6f6886baba (diff)
downloadgnuradio-405a2871f397a175b9aab6cd78e7ad47abe2f36f.tar.gz
gnuradio-405a2871f397a175b9aab6cd78e7ad47abe2f36f.tar.bz2
gnuradio-405a2871f397a175b9aab6cd78e7ad47abe2f36f.zip
Misc. gnuradio-core build system minor cleanup.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3124 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core')
-rw-r--r--gnuradio-core/Makefile.am3
-rw-r--r--gnuradio-core/doc/Makefile.am2
-rw-r--r--gnuradio-core/src/lib/Makefile.am3
3 files changed, 2 insertions, 6 deletions
diff --git a/gnuradio-core/Makefile.am b/gnuradio-core/Makefile.am
index b4b619b8b..846c59994 100644
--- a/gnuradio-core/Makefile.am
+++ b/gnuradio-core/Makefile.am
@@ -29,8 +29,5 @@ EXTRA_DIST = \
SUBDIRS = src doc
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gnuradio-core.pc
-
etcdir = $(sysconfdir)/gnuradio/conf.d
etc_DATA = gnuradio-core.conf
diff --git a/gnuradio-core/doc/Makefile.am b/gnuradio-core/doc/Makefile.am
index 562b36654..40c910d72 100644
--- a/gnuradio-core/doc/Makefile.am
+++ b/gnuradio-core/doc/Makefile.am
@@ -54,7 +54,7 @@ prep:
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(docdir)
- @for i in $(top_srcdir)/README $(top_srcdir)/README.hacking $(top_srcdir)/ChangeLog; do \
+ @for i in $(top_srcdir)/gnuradio-core/README $(top_srcdir)/gnuradio-core/README.hacking $(top_srcdir)/gnuradio-core/ChangeLog; do \
echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \
done
diff --git a/gnuradio-core/src/lib/Makefile.am b/gnuradio-core/src/lib/Makefile.am
index 2b31b3fce..7d37a4e35 100644
--- a/gnuradio-core/src/lib/Makefile.am
+++ b/gnuradio-core/src/lib/Makefile.am
@@ -25,7 +25,7 @@ include $(top_srcdir)/Makefile.common
# We've got to build . before swig
# FIXME add atsc back
-SUBDIRS = missing runtime filter general g72x reed-solomon omnithread io . swig
+SUBDIRS = missing runtime filter general g72x reed-solomon omnithread io . swig
# generate libgnuradio-core.la from the convenience libraries in subdirs
@@ -59,4 +59,3 @@ libgnuradio_core_qa_la_LIBADD = \
missing/libmissing.la \
libgnuradio-core.la \
$(CPPUNIT_LIBS)
-