diff options
| author | jblum | 2008-10-07 18:32:29 +0000 |
|---|---|---|
| committer | jblum | 2008-10-07 18:32:29 +0000 |
| commit | e0feca2c67788dffeff9a21fb047a8965658e528 (patch) | |
| tree | 8a56fc4fc1df3c3f3ebdf64e019539f9bc9273af /grc | |
| parent | 28aecb1ad5ce542a7611bb5a38001a32097bfb73 (diff) | |
| download | gnuradio-e0feca2c67788dffeff9a21fb047a8965658e528.tar.gz gnuradio-e0feca2c67788dffeff9a21fb047a8965658e528.tar.bz2 gnuradio-e0feca2c67788dffeff9a21fb047a8965658e528.zip | |
re-enable grc, passes distcheck
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9723 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/freedesktop/Makefile.am | 13 | ||||
| -rw-r--r-- | grc/src/platforms/base/Makefile.am | 10 | ||||
| -rw-r--r-- | grc/src/platforms/python/Makefile.am | 10 |
3 files changed, 16 insertions, 17 deletions
diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am index 3ec4ac5b2..3755f2e1e 100644 --- a/grc/freedesktop/Makefile.am +++ b/grc/freedesktop/Makefile.am @@ -22,6 +22,7 @@ include $(top_srcdir)/grc/Makefile.inc ourdatadir = $(grc_data_prefix)/freedesktop + dist_ourdata_DATA = \ grc-icon-256.png \ grc-icon-128.png \ @@ -33,14 +34,16 @@ dist_ourdata_DATA = \ gnuradio-usrp_diagnostics.desktop dist_bin_SCRIPTS = grc_setup_freedesktop -BUILT_SOURCES = grc_setup_freedesktop -grc_setup_freedesktop: Makefile $(srcdir)/grc_setup_freedesktop.in - sed -e 's|@SRCDIR[@]|$(ourdatadir)|g' $(srcdir)/grc_setup_freedesktop.in > $@ + +grc_setup_freedesktop: Makefile grc_setup_freedesktop.in + $(SED) -e 's|@SRCDIR[@]|$(ourdatadir)|g' $(srcdir)/$@.in > $@ EXTRA_DIST = $(srcdir)/grc_setup_freedesktop.in -MOSTLYCLEANFILES = $(BUILT_SOURCES) + +MOSTLYCLEANFILES = grc_setup_freedesktop install-data-hook: grc_setup_freedesktop - grc_setup_freedesktop install + bash $(srcdir)/grc_setup_freedesktop install $(srcdir) + uninstall-hook: grc_setup_freedesktop bash $(srcdir)/grc_setup_freedesktop uninstall $(srcdir) diff --git a/grc/src/platforms/base/Makefile.am b/grc/src/platforms/base/Makefile.am index fbfc87e00..4cc08b036 100644 --- a/grc/src/platforms/base/Makefile.am +++ b/grc/src/platforms/base/Makefile.am @@ -34,15 +34,13 @@ ourpython_PYTHON = \ Port.py \ __init__.py -BUILT_SOURCES = Constants.py - -Constants.py: Makefile $(srcdir)/Constants.py.in - sed \ +Constants.py: Makefile Constants.py.in + $(SED) \ -e 's|@PACKAGE[@]|$(PACKAGE)|g' \ -e 's|@VERSION[@]|$(VERSION)|g' \ -e 's|@datadir[@]|$(grc_base_data_dir)|g' \ - $(srcdir)/Constants.py.in > $@ + $(srcdir)/$@.in > $@ EXTRA_DIST = $(srcdir)/Constants.py.in -MOSTLYCLEANFILES = $(BUILT_SOURCES) +MOSTLYCLEANFILES = Constants.py diff --git a/grc/src/platforms/python/Makefile.am b/grc/src/platforms/python/Makefile.am index 13b5f77d8..d50ed54ed 100644 --- a/grc/src/platforms/python/Makefile.am +++ b/grc/src/platforms/python/Makefile.am @@ -36,16 +36,14 @@ ourpython_PYTHON = \ Port.py \ __init__.py -BUILT_SOURCES = Constants.py - -Constants.py: Makefile $(srcdir)/Constants.py.in - sed \ +Constants.py: Makefile Constants.py.in + $(SED) \ -e 's|@PYTHONW[@]|$(PYTHONW)|g' \ -e 's|@datadir[@]|$(grc_python_data_dir)|g' \ -e 's|@blocksdir[@]|$(grc_python_blocks_dir)|g' \ -e 's|@docdir[@]|$(gr_docdir)|g' \ - $(srcdir)/Constants.py.in > $@ + $(srcdir)/$@.in > $@ EXTRA_DIST = $(srcdir)/Constants.py.in -MOSTLYCLEANFILES = $(BUILT_SOURCES) +MOSTLYCLEANFILES = Constants.py |