[beast/devel: 73/77] BIRNET, BUILD: remove birnet-zintern and use rapicorn-zintern

[Tim Janik <timj src gnome org>]

commit a9479dbf5eb4715129e4d75ed28c80daa309c1fd
Author: Tim Janik <timj gnu org>
Date:   Sun Apr 14 22:53:55 2013 +0200

    BIRNET, BUILD: remove birnet-zintern and use rapicorn-zintern

 beast-gtk/dialogs/Makefile.am |    5 +-
 birnet/Makefile.am            |    5 -
 birnet/birnet-zintern.cc      |  201 -----------------------------------------
 bse/zintern/Makefile.am       |    5 +-
 4 files changed, 6 insertions(+), 210 deletions(-)
---
diff --git a/beast-gtk/dialogs/Makefile.am b/beast-gtk/dialogs/Makefile.am
index 0bb4e0d..4028669 100644
--- a/beast-gtk/dialogs/Makefile.am
+++ b/beast-gtk/dialogs/Makefile.am
@@ -1,6 +1,8 @@
 # BEAST - Better Audio System
 include $(top_srcdir)/Makefile.decl
 
+ZINTERN      = rapicorn-zintern
+
 ZFILE_DEFS = $(strip \
        bst-radgets-standard    $(srcdir)/radgets-standard.xml  \
        bst-radgets-beast       $(srcdir)/radgets-beast.xml     \
@@ -8,11 +10,10 @@ ZFILE_DEFS = $(strip \
 XML_FILES  = $(filter-out bst-%, $(ZFILE_DEFS))
 EXTRA_DIST += $(XML_FILES)
 
-ZINTERN=$(top_builddir)/birnet/birnet-zintern
 
 XMLLINTCALL=$(if $(XMLLINT),$(XMLLINT),true) # handle undefined XMLLINT
 
-beast-xml-zfiles.cc: $(XML_FILES) $(ZINTERN)
+beast-xml-zfiles.cc: $(XML_FILES)
        cd .                                            \
        && $(XMLLINTCALL) --noout $(XML_FILES)          \
        && $(ZINTERN) -b -z $(ZFILE_DEFS) > xgen-bxc    \
diff --git a/birnet/Makefile.am b/birnet/Makefile.am
index 9ded676..958e7bf 100644
--- a/birnet/Makefile.am
+++ b/birnet/Makefile.am
@@ -15,8 +15,3 @@ EXTRA_DIST += configure.inc acbirnet.m4
 
 noinst_PROGRAMS = $(ALLTESTS)
 progs_ldadd     = $(BIRNET_LIBS) $(RAPICORN_LIBS) -lm
-
-noinst_PROGRAMS       += birnet-zintern
-birnet_zintern_SOURCES = birnet-zintern.cc
-birnet_zintern_LDADD   = $(progs_ldadd)
-birnet_zintern_DEPS    = $(progs_deps)
diff --git a/bse/zintern/Makefile.am b/bse/zintern/Makefile.am
index 8333178..d9d232b 100644
--- a/bse/zintern/Makefile.am
+++ b/bse/zintern/Makefile.am
@@ -3,6 +3,7 @@ include $(top_srcdir)/Makefile.decl
 
 INCLUDES    += -I$(top_srcdir) -I$(top_builddir)
 AM_CXXFLAGS += $(BSE_CFLAGS) -DG_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS
+ZINTERN      = rapicorn-zintern
 
 ZFILE_DEFS = $(strip \
        gus-patch               $(srcdir)/gus-patch.bse         \
@@ -17,8 +18,8 @@ CLEANFILES += $(gen_sources) bse-zfile.cc bse-zfile.h
 noinst_DATA = bse-zfile.cc # bse-zfile.h
 EXTRA_DIST += $(filter %.bse, $(ZFILE_DEFS))
 
-bse-zfile.cc:  $(top_builddir)/birnet/birnet-zintern $(srcdir)/*.bse # bse-zfile.h
-       $(top_builddir)/birnet/birnet-zintern -b -z $(ZFILE_DEFS) > xgen-bzc            \
+bse-zfile.cc: $(srcdir)/*.bse # bse-zfile.h
+       $(ZINTERN) -b -z $(ZFILE_DEFS) > xgen-bzc                                       \
        && echo "static const BseZFile bse_zfiles[] = {" >> xgen-bzc                    \
        && for i in $(filter-out %.bse, $(ZFILE_DEFS)) ; do                             \
                uname=$$(echo $$i | tr a-z- A-Z_);                                      \