[Commit-gnuradio] r3426 - in gnuradio/trunk: . config gr-trellis gr-trellis/doc

[jcorgan]

Author: jcorgan
Date: 2006-08-26 11:55:12 -0600 (Sat, 26 Aug 2006)
New Revision: 3426

Modified:
   gnuradio/trunk/config/grc_usrp.m4
   gnuradio/trunk/configure.ac
   gnuradio/trunk/gr-trellis/Makefile.am
   gnuradio/trunk/gr-trellis/doc/
   gnuradio/trunk/gr-trellis/doc/Makefile.am
Log:
Fixes ticket:34.  Merged r3420:3425 from jcorgan/ticket-34.

Modified: gnuradio/trunk/config/grc_usrp.m4
===================================================================
--- gnuradio/trunk/config/grc_usrp.m4   2006-08-26 16:17:04 UTC (rev 3425)
+++ gnuradio/trunk/config/grc_usrp.m4   2006-08-26 17:55:12 UTC (rev 3426)
@@ -48,8 +48,6 @@
     UTILS_FUNC_MKSTEMP
 
     # These checks don't fail
-    AC_CHECK_PROG([XMLTO],[xmlto],[yes],[])
-    AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes])
     AC_C_BIGENDIAN
     AC_CHECK_HEADERS([byteswap.h])
     AC_CHECK_FUNCS([getrusage sched_setscheduler])

Modified: gnuradio/trunk/configure.ac
===================================================================
--- gnuradio/trunk/configure.ac 2006-08-26 16:17:04 UTC (rev 3425)
+++ gnuradio/trunk/configure.ac 2006-08-26 17:55:12 UTC (rev 3426)
@@ -47,6 +47,9 @@
 GR_NO_UNDEFINED                dnl do we need the -no-undefined linker flag
 GR_SCRIPTING
 
+AC_CHECK_PROG([XMLTO],[xmlto],[yes],[])
+AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes])
+
 dnl Checks for libraries.
 AC_CHECK_LIB(socket,socket)
 

Modified: gnuradio/trunk/gr-trellis/Makefile.am
===================================================================
--- gnuradio/trunk/gr-trellis/Makefile.am       2006-08-26 16:17:04 UTC (rev 
3425)
+++ gnuradio/trunk/gr-trellis/Makefile.am       2006-08-26 17:55:12 UTC (rev 
3426)
@@ -21,6 +21,5 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = src
-DIST_SUBDIRS = src doc
+SUBDIRS = src doc
 


Property changes on: gnuradio/trunk/gr-trellis/doc
___________________________________________________________________
Name: svn:ignore
   - Makefile
Makefile.in
.deps
.libs
*.la
*.lo
autom4te.cache
*.cache
howto-write-a-block.html
gr_block.h.xml
howto_1.i.xml
howto_square_ff.cc.xml
howto_square_ff.h.xml
qa_howto_1.py.xml
src_lib_Makefile_1.am.xml
src_lib_Makefile_2.am.xml
howto_square2_ff.cc.xml
howto_square2_ff.h.xml

   + Makefile
Makefile.in
*.html


Modified: gnuradio/trunk/gr-trellis/doc/Makefile.am
===================================================================
--- gnuradio/trunk/gr-trellis/doc/Makefile.am   2006-08-26 16:17:04 UTC (rev 
3425)
+++ gnuradio/trunk/gr-trellis/doc/Makefile.am   2006-08-26 17:55:12 UTC (rev 
3426)
@@ -19,33 +19,46 @@
 # Boston, MA 02111-1307, USA.
 # 
 
-TARGETS = gr-trellis.html
+docdir=$(prefix)/share/doc/@address@hidden@VERSION@
 
+HTML_FILES =
 
-# To avoid build problems for folks who don't have xmlto installed, we
-# don't build the docs by default.
+if HAS_XMLTO
+HTML_FILES += \
+    gr-trellis.html
+endif
 
-# html: $(TARGETS)
-all: $(TARGETS)
+all: $(HTML_FILES)
 
+EXTRA_DIST = \
+    gr-trellis.xml \
+    make_numbered_listing.py \
+    test_tcm.py \
+    test_tcm.py.xml
 
-EXTRA_DIST =                           
-
-
 BUILT_XML_FILES =                      
 
-
-gr-trellis.html : gr-trellis.xml $(BUILT_XML_FILES)
-
-
-
 # ----------------------------------------------------------------
 
-clean:
-       -rm -f $(TARGETS) $(BUILT_XML_FILES)
-
 %.html : %.xml
        xmlto html-nochunks $<
 
 %.xml : % make_numbered_listing.py
        ./make_numbered_listing.py $<
+
+install-data-local:
+       mkdir -p $(DESTDIR)$(docdir)/html
+       @for i in $(HTML_FILES); do \
+               echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/html"; \
+               $(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/html; \
+       done
+
+uninstall-local:
+       @for i in $(HTML_FILES); do \
+               echo "$(RM) $(DESTDIR)$(docdir)/$$i;"; \
+               $(RM) $(DESTDIR)$(docdir)/$$i; \
+       done
+       $(RM) -fr $(DESTDIR)$(docdir)/html
+
+clean-local:
+       $(RM) -fr $(HTML_FILES) *~
\ No newline at end of file