Changeset 9723

Show
Ignore:
Timestamp:
10/07/08 12:32:29
Author:
jblum
Message:

re-enable grc, passes distcheck

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gnuradio/trunk/configure.ac

    r9699 r9723  
    9797AC_CHECK_PROG([XMLTO],[xmlto],[yes],[]) 
    9898AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes]) 
     99 
     100AC_PROG_SED 
    99101 
    100102dnl Checks for libraries. 
    …… 
    298300GRC_GR_UTILS                    dnl this must come after GRC_GR_WXGUI 
    299301GRC_GNURADIO_EXAMPLES           dnl must come after all GRC_GR_* 
    300 dnl GRC_GRC                     dnl breaks the build at r9698 ticket:298 
     302GRC_GRC 
    301303 
    302304# Each component is now either to be built, was skipped, will be 

  • gnuradio/trunk/grc/freedesktop/Makefile.am

    r9705 r9723  
    2323 
    2424ourdatadir = $(grc_data_prefix)/freedesktop 
     25 
    2526dist_ourdata_DATA = \ 
    2627        grc-icon-256.png \ 
    …… 
    3435 
    3536dist_bin_SCRIPTS = grc_setup_freedesktop 
    36 BUILT_SOURCES = grc_setup_freedesktop 
    37 grc_setup_freedesktop: Makefile $(srcdir)/grc_setup_freedesktop.in 
    38         sed -e 's|@SRCDIR[@]|$(ourdatadir)|g' $(srcdir)/grc_setup_freedesktop.in > $@ 
     37 
     38grc_setup_freedesktop: Makefile grc_setup_freedesktop.in 
     39        $(SED) -e 's|@SRCDIR[@]|$(ourdatadir)|g' $(srcdir)/$@.in > $@ 
    3940 
    4041EXTRA_DIST = $(srcdir)/grc_setup_freedesktop.in 
    41 MOSTLYCLEANFILES = $(BUILT_SOURCES) 
     42 
     43MOSTLYCLEANFILES = grc_setup_freedesktop 
    4244 
    4345install-data-hook: grc_setup_freedesktop 
    44         grc_setup_freedesktop install 
     46        bash $(srcdir)/grc_setup_freedesktop install $(srcdir) 
     47 
    4548uninstall-hook: grc_setup_freedesktop 
    4649        bash $(srcdir)/grc_setup_freedesktop uninstall $(srcdir) 

  • gnuradio/trunk/grc/src/platforms/base/Makefile.am

    r9603 r9723  
    3535        __init__.py 
    3636 
    37 BUILT_SOURCES = Constants.py 
    38  
    39 Constants.py: Makefile $(srcdir)/Constants.py.in 
    40         sed \ 
     37Constants.py: Makefile Constants.py.in 
     38        $(SED) \ 
    4139                -e 's|@PACKAGE[@]|$(PACKAGE)|g' \ 
    4240                -e 's|@VERSION[@]|$(VERSION)|g' \ 
    4341                -e 's|@datadir[@]|$(grc_base_data_dir)|g' \ 
    44         $(srcdir)/Constants.py.in > $@ 
     42        $(srcdir)/$@.in > $@ 
    4543 
    4644EXTRA_DIST = $(srcdir)/Constants.py.in 
    4745 
    48 MOSTLYCLEANFILES = $(BUILT_SOURCES) 
     46MOSTLYCLEANFILES = Constants.py 

  • gnuradio/trunk/grc/src/platforms/python/Makefile.am

    r9600 r9723  
    3737        __init__.py 
    3838 
    39 BUILT_SOURCES = Constants.py 
    40  
    41 Constants.py: Makefile $(srcdir)/Constants.py.in 
    42         sed \ 
     39Constants.py: Makefile Constants.py.in 
     40        $(SED) \ 
    4341                -e 's|@PYTHONW[@]|$(PYTHONW)|g' \ 
    4442                -e 's|@datadir[@]|$(grc_python_data_dir)|g' \ 
    4543                -e 's|@blocksdir[@]|$(grc_python_blocks_dir)|g' \ 
    4644                -e 's|@docdir[@]|$(gr_docdir)|g' \ 
    47         $(srcdir)/Constants.py.in > $@ 
     45        $(srcdir)/$@.in > $@ 
    4846 
    4947EXTRA_DIST = $(srcdir)/Constants.py.in 
    5048 
    51 MOSTLYCLEANFILES = $(BUILT_SOURCES) 
     49MOSTLYCLEANFILES = Constants.py