commit-gnuradio
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r9366 - in gnuradio/branches/developers/jblum/grc/grc:

From: jblum
Subject: [Commit-gnuradio] r9366 - in gnuradio/branches/developers/jblum/grc/grc: data data/grc data/grc_gnuradio src/grc src/grc/elements src/grc/gui src/grc/gui/elements src/grc_gnuradio src/grc_gnuradio/blks2 src/grc_gnuradio/usrp src/grc_gnuradio/utils src/grc_gnuradio/wxgui
Date: Thu, 21 Aug 2008 16:34:22 -0600 (MDT) 
Author: jblum
Date: 2008-08-21 16:34:21 -0600 (Thu, 21 Aug 2008)
New Revision: 9366

Modified:
   gnuradio/branches/developers/jblum/grc/grc/data/Makefile.common
   gnuradio/branches/developers/jblum/grc/grc/data/grc/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/src/grc/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/src/grc/elements/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/src/grc/gui/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/src/grc/gui/elements/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/blks2/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/usrp/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/utils/Makefile.am
   
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/utils/extract_docs.py
   gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/wxgui/Makefile.am
Log:
makefiles

Modified: gnuradio/branches/developers/jblum/grc/grc/data/Makefile.common
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/data/Makefile.common     
2008-08-21 21:42:26 UTC (rev 9365)
+++ gnuradio/branches/developers/jblum/grc/grc/data/Makefile.common     
2008-08-21 22:34:21 UTC (rev 9366)
@@ -24,12 +24,13 @@
 grc_data_prefix = $(prefix)/share/${PACKAGE}/grc
 
 install-data-local:
-       mkdir -p $(datadir)
+       $(mkinstalldirs) $(datadir)
        $(foreach file, $(EXTRA_DIST), \
-               $(INSTALL_DATA) $(srcdir)/$(file) $(DESTDIR)$(datadir)/$(file); 
\
+               $(INSTALL_DATA) $(srcdir)/$(file) $(datadir)/$(file); \
        )
 
 uninstall-local:
        $(foreach file, $(EXTRA_DIST), \
-               $(RM) $(DESTDIR)$(datadir)/$(file); \
+               $(RM) $(datadir)/$(file); \
        )
+       $(RM) -fr $(datadir)

Modified: gnuradio/branches/developers/jblum/grc/grc/data/grc/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/data/grc/Makefile.am     
2008-08-21 21:42:26 UTC (rev 9365)
+++ gnuradio/branches/developers/jblum/grc/grc/data/grc/Makefile.am     
2008-08-21 22:34:21 UTC (rev 9366)
@@ -38,3 +38,5 @@
        grc-icon-256.png \
        grc-icon-256.svg \
        grc-icon-32.png
+
+MOSTLYCLEANFILES = $(gen_file)

Modified: 
gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/Makefile.am    
2008-08-21 21:42:26 UTC (rev 9365)
+++ gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/Makefile.am    
2008-08-21 22:34:21 UTC (rev 9366)
@@ -41,3 +41,5 @@
        block_tree.xml \
        default_flow_graph.grc.xml \
        flow_graph.tmpl
+
+MOSTLYCLEANFILES = $(gen_file)

Modified: gnuradio/branches/developers/jblum/grc/grc/src/grc/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/src/grc/Makefile.am      
2008-08-21 21:42:26 UTC (rev 9365)
+++ gnuradio/branches/developers/jblum/grc/grc/src/grc/Makefile.am      
2008-08-21 22:34:21 UTC (rev 9366)
@@ -36,5 +36,3 @@
        Preferences.py \
        StateCache.py \
        Utils.py
-
-MOSTLYCLEANFILES = *.pyc

Modified: 
gnuradio/branches/developers/jblum/grc/grc/src/grc/elements/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/src/grc/elements/Makefile.am     
2008-08-21 21:42:26 UTC (rev 9365)
+++ gnuradio/branches/developers/jblum/grc/grc/src/grc/elements/Makefile.am     
2008-08-21 22:34:21 UTC (rev 9366)
@@ -32,5 +32,3 @@
        Param.py \
        Platform.py \
        Port.py
-
-MOSTLYCLEANFILES = *.pyc

Modified: gnuradio/branches/developers/jblum/grc/grc/src/grc/gui/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/src/grc/gui/Makefile.am  
2008-08-21 21:42:26 UTC (rev 9365)
+++ gnuradio/branches/developers/jblum/grc/grc/src/grc/gui/Makefile.am  
2008-08-21 22:34:21 UTC (rev 9366)
@@ -35,5 +35,3 @@
        MainWindow.py \
        NotebookPage.py \
        ParamsDialog.py
-
-MOSTLYCLEANFILES = *.pyc

Modified: 
gnuradio/branches/developers/jblum/grc/grc/src/grc/gui/elements/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/src/grc/gui/elements/Makefile.am 
2008-08-21 21:42:26 UTC (rev 9365)
+++ gnuradio/branches/developers/jblum/grc/grc/src/grc/gui/elements/Makefile.am 
2008-08-21 22:34:21 UTC (rev 9366)
@@ -34,5 +34,3 @@
        Platform.py \
        Port.py \
        Utils.py
-
-MOSTLYCLEANFILES = *.pyc

Modified: 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Makefile.am     
2008-08-21 21:42:26 UTC (rev 9365)
+++ gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Makefile.am     
2008-08-21 22:34:21 UTC (rev 9366)
@@ -35,5 +35,3 @@
        Platform.py \
        Param.py \
        Port.py
-
-MOSTLYCLEANFILES = *.pyc

Modified: 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/blks2/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/blks2/Makefile.am   
    2008-08-21 21:42:26 UTC (rev 9365)
+++ 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/blks2/Makefile.am   
    2008-08-21 22:34:21 UTC (rev 9366)
@@ -29,5 +29,3 @@
        packet.py \
        queue.py \
        selector.py
-
-MOSTLYCLEANFILES = *.pyc

Modified: 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/usrp/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/usrp/Makefile.am    
    2008-08-21 21:42:26 UTC (rev 9365)
+++ 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/usrp/Makefile.am    
    2008-08-21 22:34:21 UTC (rev 9366)
@@ -26,5 +26,3 @@
 ourpython_PYTHON = \
        __init__.py \
        simple_usrp.py
-
-MOSTLYCLEANFILES = *.pyc

Modified: 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/utils/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/utils/Makefile.am   
    2008-08-21 21:42:26 UTC (rev 9365)
+++ 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/utils/Makefile.am   
    2008-08-21 22:34:21 UTC (rev 9366)
@@ -28,5 +28,3 @@
        convert_hier.py \
        expr_utils.py \
        extract_docs.py
-
-MOSTLYCLEANFILES = *.pyc

Modified: 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/utils/extract_docs.py
===================================================================
--- 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/utils/extract_docs.py
   2008-08-21 21:42:26 UTC (rev 9365)
+++ 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/utils/extract_docs.py
   2008-08-21 22:34:21 UTC (rev 9366)
@@ -24,6 +24,9 @@
 from lxml import etree
 import os
 
+#NOTE: all in python 2.5 and up
+all = lambda args: sum(map(int, map(bool, args))) == len(args)
+
 DOXYGEN_NAME_XPATH = '/doxygen/compounddef/compoundname'
 DOXYGEN_BRIEFDESC_GR_XPATH = '/doxygen/compounddef/briefdescription'
 DOXYGEN_DETAILDESC_GR_XPATH = '/doxygen/compounddef/detaileddescription'

Modified: 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/wxgui/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/wxgui/Makefile.am   
    2008-08-21 21:42:26 UTC (rev 9365)
+++ 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/wxgui/Makefile.am   
    2008-08-21 22:34:21 UTC (rev 9366)
@@ -27,5 +27,3 @@
        __init__.py \
        callback_controls.py \
        top_block_gui.py
-
-MOSTLYCLEANFILES = *.pyc
reply via email to
[Prev in Thread] Current Thread [Next in Thread]