From 175c074ba74143d5af530e5cc4bd50335f64b1d5 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 28 Oct 2009 14:33:52 -0700 Subject: [PATCH] Created a grc_blockdir in makefile.common. Switched the grc src prefix in grc makefiles. Removed grc/Makefile.inc as it was no longer neededed. --- Makefile.common | 3 +++ gr-noaa/grc/Makefile.am | 2 +- grc/Makefile.am | 4 ++-- grc/Makefile.inc | 24 ------------------------ grc/base/Makefile.am | 6 +++--- grc/blocks/Makefile.am | 2 +- grc/freedesktop/Makefile.am | 2 +- grc/gui/Makefile.am | 4 ++-- grc/python/Makefile.am | 6 +++--- grc/scripts/Makefile.am | 4 ++-- 10 files changed, 18 insertions(+), 39 deletions(-) delete mode 100644 grc/Makefile.inc diff --git a/Makefile.common b/Makefile.common index aca56b34..64891345 100644 --- a/Makefile.common +++ b/Makefile.common @@ -113,6 +113,9 @@ gr_docdir = $(docdir)-$(DOCVER) # System configuration files gr_prefsdir = $(GR_PREFSDIR) +# Data directory for grc block wrappers +grc_blocksdir = $(pkgdatadir)/grc/blocks + # Other common defines; use "+=" to add to these STAMPS = MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT diff --git a/gr-noaa/grc/Makefile.am b/gr-noaa/grc/Makefile.am index 1f056473..a290204b 100644 --- a/gr-noaa/grc/Makefile.am +++ b/gr-noaa/grc/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -grcblocksdir = $(prefix)/share/gnuradio/grc/blocks +grcblocksdir = $(grc_blocksdir) dist_grcblocks_DATA = \ noaa_hrpt_decoder.xml \ diff --git a/grc/Makefile.am b/grc/Makefile.am index 30b955a1..2b5dc730 100644 --- a/grc/Makefile.am +++ b/grc/Makefile.am @@ -19,7 +19,7 @@ # Boston, MA 02110-1301, USA. # -include $(top_srcdir)/grc/Makefile.inc +include $(top_srcdir)/Makefile.common if PYTHON SUBDIRS = \ @@ -35,7 +35,7 @@ if XDG_UTILS SUBDIRS += freedesktop endif -ourpythondir = $(grc_src_prefix) +ourpythondir = $(pkgpythondir)/grc ourpython_PYTHON = __init__.py etcdir = $(gr_prefsdir) diff --git a/grc/Makefile.inc b/grc/Makefile.inc deleted file mode 100644 index c45d1ce1..00000000 --- a/grc/Makefile.inc +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright 2008, 2009 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common -grc_src_prefix = $(pkgpythondir)/grc -grc_blocksdir = $(pkgdatadir)/grc/blocks diff --git a/grc/base/Makefile.am b/grc/base/Makefile.am index e489601d..6a95e33b 100644 --- a/grc/base/Makefile.am +++ b/grc/base/Makefile.am @@ -19,9 +19,9 @@ # Boston, MA 02110-1301, USA. # -include $(top_srcdir)/grc/Makefile.inc +include $(top_srcdir)/Makefile.common -ourpythondir = $(grc_src_prefix)/base +ourpythondir = $(pkgpythondir)/grc/base ourpython_PYTHON = \ odict.py \ ParseXML.py \ @@ -35,7 +35,7 @@ ourpython_PYTHON = \ Port.py \ __init__.py -ourdatadir = $(grc_src_prefix)/base +ourdatadir = $(pkgpythondir)/grc/base dist_ourdata_DATA = \ block_tree.dtd \ flow_graph.dtd diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am index 61c00380..9194d99e 100644 --- a/grc/blocks/Makefile.am +++ b/grc/blocks/Makefile.am @@ -19,7 +19,7 @@ # Boston, MA 02110-1301, USA. # -include $(top_srcdir)/grc/Makefile.inc +include $(top_srcdir)/Makefile.common ourdatadir = $(grc_blocksdir) dist_ourdata_DATA = \ diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am index 79388ba3..bfbdee94 100644 --- a/grc/freedesktop/Makefile.am +++ b/grc/freedesktop/Makefile.am @@ -19,7 +19,7 @@ # Boston, MA 02110-1301, USA. # -include $(top_srcdir)/grc/Makefile.inc +include $(top_srcdir)/Makefile.common ourdatadir = $(pkgdatadir)/grc/freedesktop diff --git a/grc/gui/Makefile.am b/grc/gui/Makefile.am index b14817d0..a73b6855 100644 --- a/grc/gui/Makefile.am +++ b/grc/gui/Makefile.am @@ -19,9 +19,9 @@ # Boston, MA 02110-1301, USA. # -include $(top_srcdir)/grc/Makefile.inc +include $(top_srcdir)/Makefile.common -ourpythondir = $(grc_src_prefix)/gui +ourpythondir = $(pkgpythondir)/grc/gui ourpython_PYTHON = \ Block.py \ Colors.py \ diff --git a/grc/python/Makefile.am b/grc/python/Makefile.am index 0a62c082..67b71bc4 100644 --- a/grc/python/Makefile.am +++ b/grc/python/Makefile.am @@ -19,9 +19,9 @@ # Boston, MA 02110-1301, USA. # -include $(top_srcdir)/grc/Makefile.inc +include $(top_srcdir)/Makefile.common -ourpythondir = $(grc_src_prefix)/python +ourpythondir = $(pkgpythondir)/grc/python ourpython_PYTHON = \ convert_hier.py \ expr_utils.py \ @@ -37,7 +37,7 @@ ourpython_PYTHON = \ Port.py \ __init__.py -ourdatadir = $(grc_src_prefix)/python +ourdatadir = $(pkgpythondir)/grc/python dist_ourdata_DATA = \ block.dtd \ default_flow_graph.grc \ diff --git a/grc/scripts/Makefile.am b/grc/scripts/Makefile.am index 35c75d5f..e24f8880 100644 --- a/grc/scripts/Makefile.am +++ b/grc/scripts/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2008 Free Software Foundation, Inc. +# Copyright 2008, 2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -19,6 +19,6 @@ # Boston, MA 02110-1301, USA. # -include $(top_srcdir)/grc/Makefile.inc +include $(top_srcdir)/Makefile.common dist_bin_SCRIPTS = grc usrp2_probe usrp_probe -- 2.30.2