[Commit-gnuradio] r4416 - gnuradio/branches/releases/3.0/gnuradio-core/src/lib/swig

[jcorgan]

Author: jcorgan
Date: 2007-02-07 12:13:43 -0700 (Wed, 07 Feb 2007)
New Revision: 4416

Modified:
   gnuradio/branches/releases/3.0/gnuradio-core/src/lib/swig/Makefile.am
Log:
Revert botched merge of swig/Makefile.am

Modified: gnuradio/branches/releases/3.0/gnuradio-core/src/lib/swig/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/gnuradio-core/src/lib/swig/Makefile.am       
2007-02-07 19:07:29 UTC (rev 4415)
+++ gnuradio/branches/releases/3.0/gnuradio-core/src/lib/swig/Makefile.am       
2007-02-07 19:13:43 UTC (rev 4416)
@@ -96,75 +96,6 @@
 
 # ----------------------------------------------------------------
 
-<<<<<<< .working
-=======
-_gnuradio_swig_py_filter_la_SOURCES =          \
-       gnuradio_swig_py_filter.cc              
-
-
-_gnuradio_swig_py_filter_la_LIBADD  =          \
-       $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la       \
-       $(PYTHON_LDFLAGS)                       \
-       -lstdc++
-
-_gnuradio_swig_py_filter_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
-
-
-# KLUDGE: Force filter include of gnuradio_swig_py_filter.d dependency file.
-# This is not guaranteed to be portable, but will probably work.
-# If it works, we have accurate dependencies for our swig stuff, which is good.
address@hidden@ @address@hidden/address@hidden@
-
-gnuradio_swig_py_filter.py gnuradio_swig_py_filter.h: 
gnuradio_swig_py_filter.cc
-
-gnuradio_swig_py_filter.cc : sw_filter.i
-       if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_py_filter.Td 
-module gnuradio_swig_py_filter -o gnuradio_swig_py_filter.cc sw_filter.i ;\
-       then if test $(host_os) = mingw32; \
-            then sed 's,\\\\,/,g' <gnuradio_swig_py_filter.Td 
>gnuradio_swig_py_filter.d; rm -f gnuradio_swig_py_filter.Td; \
-            else mv -f gnuradio_swig_py_filter.Td gnuradio_swig_py_filter.d; 
fi \
-       else rm -f gnuradio_swig_py_filter.Td; exit 1; fi 
-
-
-# ----------------------------------------------------------------
-# Part 5: sw_io.i -> gnuradio_swig_py_io
-#
-
-_gnuradio_swig_py_io_la_SOURCES =              \
-       gnuradio_swig_py_io.cc          
-
-
-_gnuradio_swig_py_io_la_LIBADD  =              \
-       $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la       \
-       $(PYTHON_LDFLAGS)                       \
-       -lstdc++
-
-_gnuradio_swig_py_io_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
-
-
-# KLUDGE: Force io include of gnuradio_swig_py_io.d dependency file.
-# This is not guaranteed to be portable, but will probably work.
-# If it works, we have accurate dependencies for our swig stuff, which is good.
address@hidden@ @address@hidden/address@hidden@
-
-gnuradio_swig_py_io.py gnuradio_swig_py_io.h: gnuradio_swig_py_io.cc
-
-gnuradio_swig_py_io.cc : sw_io.i
-       if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_py_io.Td -module 
gnuradio_swig_py_io -o gnuradio_swig_py_io.cc sw_io.i ;\
-       then if test $(host_os) = mingw32; \
-            then sed 's,\\\\,/,g' <gnuradio_swig_py_io.Td 
>gnuradio_swig_py_io.d; rm -f gnuradio_swig_py_io.Td; \
-            else mv -f gnuradio_swig_py_io.Td gnuradio_swig_py_io.d; fi \
-       else rm -f gnuradio_swig_py_io.Td; exit 1; fi 
-
-
-# ----------------------------------------------------------------
-# FIXME As of swig 1.3.31, this still seems to be required...
-
-gnuradio_swig_bug_workaround.h : gnuradio_swig_py_runtime.cc 
$(srcdir)/gen-swig-bug-fix
-       $(PYTHON) $(srcdir)/gen-swig-bug-fix gnuradio_swig_py_runtime.cc $@
-
-# ----------------------------------------------------------------
-
->>>>>>> .merge-right.r4326
 # Don't distribute output of swig
 dist-hook:
        @for file in $(BUILT_SOURCES); do echo $(RM) $(distdir)/$$file; done