X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gr-video-sdl%2Fsrc%2FMakefile.am;h=04139afde5f51d5516a544d5e8192c4381605f69;hb=ea29b08aeb54227e6628f655ccfdb96fe4d8c378;hp=cf760993fd130387b3468739810bef05fb23e2a2;hpb=b78ae1de4d9bbde942e5e7556630d7ccd8161c30;p=debian%2Fgnuradio

diff --git a/gr-video-sdl/src/Makefile.am b/gr-video-sdl/src/Makefile.am
index cf760993..04139afd 100644
--- a/gr-video-sdl/src/Makefile.am
+++ b/gr-video-sdl/src/Makefile.am
@@ -1,11 +1,11 @@
 #
-# Copyright 2004,2005,2006 Free Software Foundation, Inc.
+# Copyright 2004,2005,2006,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
 # GNU Radio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 # 
 # GNU Radio is distributed in the hope that it will be useful,
@@ -21,70 +21,49 @@
 
 include $(top_srcdir)/Makefile.common
 
-# Install this stuff so that it ends up as the gnuradio.video_sdl module
-# This usually ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/gnuradio
-
-ourpythondir = $(grpythondir)
-ourlibdir    = $(grpyexecdir)
-
 EXTRA_DIST = run_tests.in
-TESTS = run_tests
-
-LOCAL_IFILES = 				\
-	$(top_srcdir)/gr-video-sdl/src/video_sdl.i				
-
-NON_LOCAL_IFILES =			\
-	$(GNURADIO_I)
-
-ALL_IFILES = 				\
-	$(LOCAL_IFILES)			\
-	$(NON_LOCAL_IFILES)		
-
-BUILT_SOURCES = 			\
-	video_sdl.cc			\
-	video_sdl.py				
 
-ourpython_PYTHON =			\
-	video_sdl.py
-
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(SDL_CFLAGS)
-
-SWIGCPPPYTHONARGS = -fvirtual -python -modern $(PYTHON_CPPFLAGS) $(STD_DEFINES_AND_INCLUDES)
+TESTS = run_tests
 
-ourlib_LTLIBRARIES = _video_sdl.la
+DISTCLEANFILES = run_tests
 
-_video_sdl_la_SOURCES = 		\
-	video_sdl.cc			\
-	video_sdl_sink_uc.cc		\
-	video_sdl_sink_s.cc
+noinst_PYTHON =				\
+	qa_video_sdl.py
 
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(SDL_CFLAGS) \
+	$(WITH_INCLUDES)
 
 grinclude_HEADERS =			\
 	video_sdl_sink_uc.h		\
 	video_sdl_sink_s.h
 
-swiginclude_HEADERS = 			\
-	$(LOCAL_IFILES)
+#################################
+# SWIG interface and library
 
-_video_sdl_la_LIBADD = 			\
-	$(PYTHON_LDFLAGS)		\
-	$(GNURADIO_CORE_LA)		\
-        $(SDL_LIBS)			\
-	-lstdc++				
+TOP_SWIG_IFILES =			\
+	video_sdl.i
 
-_video_sdl_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
+# Install so that they end up available as:
+#   import gnuradio.video_sdl
+# This ends up at:
+#   ${prefix}/lib/python${python_version}/site-packages/gnuradio
+video_sdl_pythondir_category =		\
+	gnuradio
 
-video_sdl.cc video_sdl.py: $(ALL_IFILES)
-	$(SWIG) $(SWIGCPPPYTHONARGS) -module video_sdl -o video_sdl.cc $(LOCAL_IFILES)
+# additional sources for the SWIG-generated library
+video_sdl_la_swig_sources =		\
+	video_sdl_sink_uc.cc		\
+	video_sdl_sink_s.cc
 
+# additional libraries for linking with the SWIG-generated library
+video_sdl_la_swig_libadd =		\
+	$(SDL_LIBS)			\
+	$(GNURADIO_CORE_LA)
 
-noinst_PYTHON = qa_video_sdl.py
+include $(top_srcdir)/Makefile.swig
 
-MOSTLYCLEANFILES = \
-	$(BUILT_SOURCES) *~ *.pyc
+# add some of the variables generated inside the Makefile.swig.gen
+BUILT_SOURCES = $(swig_built_sources)
 
-# Don't distribute output of swig
-dist-hook:
-	@for file in $(BUILT_SOURCES); do echo $(RM) $(distdir)/$$file; done
-	@for file in $(BUILT_SOURCES); do $(RM) $(distdir)/$$file; done
+# Do not distribute the output of SWIG
+no_dist_files = $(swig_built_sources)