Changeset 4416

Show
Ignore:
Timestamp:
02/07/07 12:13:43
Author:
jcorgan
Message:

Revert botched merge of swig/Makefile.am

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • gnuradio/branches/releases/3.0/gnuradio-core/src/lib/swig/Makefile.am

    r4415 r4416  
    9797# ---------------------------------------------------------------- 
    9898 
    99 <<<<<<< .working 
    100 ======= 
    101 _gnuradio_swig_py_filter_la_SOURCES =           \ 
    102         gnuradio_swig_py_filter.cc               
    103  
    104  
    105 _gnuradio_swig_py_filter_la_LIBADD  =           \ 
    106         $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la       \ 
    107         $(PYTHON_LDFLAGS)                       \ 
    108         -lstdc++ 
    109  
    110 _gnuradio_swig_py_filter_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) 
    111  
    112  
    113 # KLUDGE: Force filter include of gnuradio_swig_py_filter.d dependency file. 
    114 # This is not guaranteed to be portable, but will probably work. 
    115 # If it works, we have accurate dependencies for our swig stuff, which is good. 
    116 @am__include@ @am__quote@./gnuradio_swig_py_filter.d@am__quote@ 
    117  
    118 gnuradio_swig_py_filter.py gnuradio_swig_py_filter.h: gnuradio_swig_py_filter.cc 
    119  
    120 gnuradio_swig_py_filter.cc : sw_filter.i 
    121         if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_py_filter.Td -module gnuradio_swig_py_filter -o gnuradio_swig_py_filter.cc sw_filter.i ;\ 
    122         then if test $(host_os) = mingw32; \ 
    123              then sed 's,\\\\,/,g' <gnuradio_swig_py_filter.Td >gnuradio_swig_py_filter.d; rm -f gnuradio_swig_py_filter.Td; \ 
    124              else mv -f gnuradio_swig_py_filter.Td gnuradio_swig_py_filter.d; fi \ 
    125         else rm -f gnuradio_swig_py_filter.Td; exit 1; fi  
    126  
    127  
    128 # ---------------------------------------------------------------- 
    129 # Part 5: sw_io.i -> gnuradio_swig_py_io 
    130 # 
    131  
    132 _gnuradio_swig_py_io_la_SOURCES =               \ 
    133         gnuradio_swig_py_io.cc           
    134  
    135  
    136 _gnuradio_swig_py_io_la_LIBADD  =               \ 
    137         $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la       \ 
    138         $(PYTHON_LDFLAGS)                       \ 
    139         -lstdc++ 
    140  
    141 _gnuradio_swig_py_io_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) 
    142  
    143  
    144 # KLUDGE: Force io include of gnuradio_swig_py_io.d dependency file. 
    145 # This is not guaranteed to be portable, but will probably work. 
    146 # If it works, we have accurate dependencies for our swig stuff, which is good. 
    147 @am__include@ @am__quote@./gnuradio_swig_py_io.d@am__quote@ 
    148  
    149 gnuradio_swig_py_io.py gnuradio_swig_py_io.h: gnuradio_swig_py_io.cc 
    150  
    151 gnuradio_swig_py_io.cc : sw_io.i 
    152         if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_py_io.Td -module gnuradio_swig_py_io -o gnuradio_swig_py_io.cc sw_io.i ;\ 
    153         then if test $(host_os) = mingw32; \ 
    154              then sed 's,\\\\,/,g' <gnuradio_swig_py_io.Td >gnuradio_swig_py_io.d; rm -f gnuradio_swig_py_io.Td; \ 
    155              else mv -f gnuradio_swig_py_io.Td gnuradio_swig_py_io.d; fi \ 
    156         else rm -f gnuradio_swig_py_io.Td; exit 1; fi  
    157  
    158  
    159 # ---------------------------------------------------------------- 
    160 # FIXME As of swig 1.3.31, this still seems to be required... 
    161  
    162 gnuradio_swig_bug_workaround.h : gnuradio_swig_py_runtime.cc $(srcdir)/gen-swig-bug-fix 
    163         $(PYTHON) $(srcdir)/gen-swig-bug-fix gnuradio_swig_py_runtime.cc $@ 
    164  
    165 # ---------------------------------------------------------------- 
    166  
    167 >>>>>>> .merge-right.r4326 
    16899# Don't distribute output of swig 
    169100dist-hook: