From 282258a9a4db61b6c06208caf99b64d2d00a4b23 Mon Sep 17 00:00:00 2001 From: Filippo Giunchedi Date: Tue, 14 Jul 2009 15:50:21 +0200 Subject: [PATCH] small refactoring of bindings/*/Makefile.am make consistent use of BUILT_SOURCES with both .cpp and .h --- bindings/java/Makefile.am | 6 +++--- bindings/perl/Makefile.am | 4 ++-- bindings/python/Makefile.am | 9 +++++---- bindings/ruby/Makefile.am | 6 +++--- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am index 38b735d6..3dda35ab 100644 --- a/bindings/java/Makefile.am +++ b/bindings/java/Makefile.am @@ -5,9 +5,9 @@ FREEJ_FLAGS = @SDL_CFLAGS@ @FT2_CFLAGS@ @XIPH_CFLAGS@ @UNICAP_CFLAGS@ \ # XXX(godog) what's missing? compilation and jar packaging? swig_source = freej_java.cpp -java_header = freej_java.h +swig_header = freej_java.h -BUILT_SOURCES = $(swig_source) +BUILT_SOURCES = $(swig_source) $(swig_header) $(swig_source): $(SWIG_IFACE) $(SWIG_COMMAND) -java -o $(swig_source) $(SWIG_IFACE) @@ -18,7 +18,7 @@ libfreej_g_la_CXXFLAGS = $(FREEJ_FLAGS) $(JAVA_CFLAGS) libfreej_g_la_LDFLAGS = $(JAVA_LDFLAGS) nodist_libfreej_g_la_SOURCES = $(swig_source) -CLEANFILES = $(swig_source) $(java_header) +CLEANFILES = $(BUILT_SOURCES) clean-local: rm -f *.class diff --git a/bindings/perl/Makefile.am b/bindings/perl/Makefile.am index 610ed6fe..00638f6c 100644 --- a/bindings/perl/Makefile.am +++ b/bindings/perl/Makefile.am @@ -6,7 +6,7 @@ FREEJ_FLAGS = @SDL_CFLAGS@ @FT2_CFLAGS@ @XIPH_CFLAGS@ @UNICAP_CFLAGS@ \ swig_source = freej_perl.cpp perl_module = freej.pm -BUILT_SOURCES = $(swig_source) +BUILT_SOURCES = $(swig_source) $(perl_module) $(swig_source): $(SWIG_IFACE) $(SWIG_COMMAND) -perl -o $(swig_source) $(SWIG_IFACE) @@ -25,4 +25,4 @@ Freej_la_CXXFLAGS = $(FREEJ_FLAGS) $(PERL_CFLAGS) nodist_Freej_la_SOURCES = $(swig_source) Freej_la_LIBADD = -L$(top_builddir)/src/.libs -lfreej -CLEANFILES = $(swig_source) $(perl_module) +CLEANFILES = $(BUILT_SOURCES) diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am index 1830de3f..3a6b45dd 100644 --- a/bindings/python/Makefile.am +++ b/bindings/python/Makefile.am @@ -4,10 +4,11 @@ FREEJ_FLAGS = @SDL_CFLAGS@ @FT2_CFLAGS@ @XIPH_CFLAGS@ @UNICAP_CFLAGS@ \ @FFMPEG_CFLAGS@ @MOZJS_CFLAGS@ @SDLGFX_CFLAGS@ swig_source = freej_py.cpp -python_module = freej.py -python_header = freej_py.h +swig_header = freej_py.h -BUILT_SOURCES = $(swig_source) +python_module = freej.py + +BUILT_SOURCES = $(swig_source) $(swig_header) $(swig_source): $(SWIG_IFACE) $(SWIG_COMMAND) $(SWIG_PYTHON_OPT) -threads -shadow -o $(swig_source) $(SWIG_IFACE) @@ -23,4 +24,4 @@ _freej_la_CXXFLAGS = $(FREEJ_FLAGS) $(SWIG_PYTHON_CPPFLAGS) _freej_la_LDFLAGS = -module -avoid-version _freej_la_LIBADD = -L$(top_builddir)/src/.libs -lfreej -CLEANFILES = $(swig_source) $(python_module) $(python_header) +CLEANFILES = $(BUILT_SOURCES) $(python_module) diff --git a/bindings/ruby/Makefile.am b/bindings/ruby/Makefile.am index 558fae68..f68738d2 100644 --- a/bindings/ruby/Makefile.am +++ b/bindings/ruby/Makefile.am @@ -4,9 +4,9 @@ FREEJ_FLAGS = @SDL_CFLAGS@ @FT2_CFLAGS@ @XIPH_CFLAGS@ @UNICAP_CFLAGS@ \ @FFMPEG_CFLAGS@ @MOZJS_CFLAGS@ @SDLGFX_CFLAGS@ swig_source = freej_ruby.cpp -ruby_header = freej_ruby.h +swig_header = freej_ruby.h -BUILT_SOURCES = $(swig_source) +BUILT_SOURCES = $(swig_source) $(swig_header) $(swig_source): $(SWIG_IFACE) $(top_srcdir)/bindings/rbpre.i $(top_srcdir)/bindings/rbpost.i $(SWIG_COMMAND) -ruby -initname Freej -o $(swig_source) $(SWIG_IFACE) @@ -24,4 +24,4 @@ Freej_la_LIBADD = $(RUBY_LIBS) -L$(top_builddir)/src/.libs -lfreej EXTRA_DIST = list_classes.rb list_classes.sh -CLEANFILES = $(swig_source) $(ruby_header) +CLEANFILES = $(BUILT_SOURCES)