[Commit-gnuradio] r3196 - gnuradio/branches/developers/jcorgan/ticket-10

[jcorgan]

Author: jcorgan
Date: 2006-08-06 21:21:14 -0600 (Sun, 06 Aug 2006)
New Revision: 3196

Modified:
   gnuradio/branches/developers/jcorgan/ticket-10/Makefile.common
Log:
gnuradio-core now completes VPATH build on virgin machine.

Modified: gnuradio/branches/developers/jcorgan/ticket-10/Makefile.common
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-10/Makefile.common      
2006-08-07 00:23:37 UTC (rev 3195)
+++ gnuradio/branches/developers/jcorgan/ticket-10/Makefile.common      
2006-08-07 03:21:14 UTC (rev 3196)
@@ -37,23 +37,28 @@
 SWIGPYTHONFLAGS = -fvirtual -python -modern
 
 # Where to find gnuradio include files in the current build tree
+# top_srcdir for original stuff, top_builddir for generated files
 GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \
                    -I$(top_srcdir)/gnuradio-core/src/lib/general \
+                   -I$(top_builddir)/gnuradio-core/src/lib/general \
                    -I$(top_srcdir)/gnuradio-core/src/lib/filter \
-                    -I$(top_srcdir)/gnuradio-core/src/lib/reed-solomon \
+                   -I$(top_builddir)/gnuradio-core/src/lib/filter \
+                   -I$(top_srcdir)/gnuradio-core/src/lib/reed-solomon \
                    -I$(top_srcdir)/gnuradio-core/src/lib/io \
                    -I$(top_srcdir)/gnuradio-core/src/lib/g72x \
                    -I$(top_srcdir)/gnuradio-core/src/lib/omnithread \
                    -I$(top_srcdir)/gnuradio-core/src/lib/swig \
-                    -I$(top_builddir)/gnuradio-core/src/lib/swig \
+                    -I$(top_srcdir)/gnuradio-core/src/lib/swig \
                    $(FFTW3F_CFLAGS)
 
+
 # These used to be set in PKGCONFIG but now point to the current
 # build tree.
 GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \
                      -lgnuradio-core -lfftw3f -lm
 
-GNURADIO_I = $(top_builddir)/gnuradio-core/src/lib/swig/gnuradio.i
+# This is a dependency for many swig operations
+GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
 
 # The below used to be set in PKGCONFIG but now point to the current
 # build tree.