GNOME.org
 

[beast/devel: 14/15] BSE: generate C++ sources instead of C

commit 388931cabbf21724d134cddd77cd420c5677c3ab
Author: Tim Janik <timj gnu org>
Date:   Mon Dec 17 04:12:18 2012 +0100

    BSE: generate C++ sources instead of C

 bse/Makefile.am          |   56 +++++++++++++++++++++++-----------------------
 bse/bseengineutils.h     |    2 +-
 bse/bseenums.cc          |    4 +-
 bse/bseparam.cc          |    4 +-
 bse/bseplugin.cc         |    4 +-
 bse/bsestandardsynths.cc |    2 +-
 bse/bsetype.cc           |    4 +-
 bse/zintern/Makefile.am  |    6 ++--
 8 files changed, 41 insertions(+), 41 deletions(-)
---
diff --git a/bse/Makefile.am b/bse/Makefile.am
index 2499040..31c9bba 100644
--- a/bse/Makefile.am
+++ b/bse/Makefile.am
@@ -177,7 +177,7 @@ $(srcdir)/gslfft.cc: @PERLRULE@ $(srcdir)/gsl-fftgen.pl $(srcdir)/gsl-fftconf.sh
 # bsegentypes.h
 GENERATED_EXTRA_DIST += bsegentypes.h
 $(libbse_la_OBJECTS): bsegentypes.h
-bsegentypes.h: @PERLRULE@ mktypes.pl $(filter-out bsegentypes.c, $(bse_sources)) $(filter-out bsegentypes.h, $(bse_public_headers))
+bsegentypes.h: @PERLRULE@ mktypes.pl $(filter-out bsegentypes.cc, $(bse_sources)) $(filter-out bsegentypes.h, $(bse_public_headers))
 bsegentypes.h: @PERLRULE@ bsecore.idl $(SFIDL)
 	( \
 	  cd $(srcdir) \
@@ -186,16 +186,16 @@ bsegentypes.h: @PERLRULE@ bsecore.idl $(SFIDL)
 	    --eprod "#define BSE_TYPE_ ENUMSHORT@\t    (BSE_TYPE_ID (@EnumName@))\n" \
 	    --eprod "extern GType BSE_TYPE_ID (@EnumName@);" \
 	      $(filter-out bsegentypes.h, $(bse_public_headers)) \
-	  && $(PERL) mktypes.pl --externs $(filter-out bsegentypes.c, $(bse_sources)) \
+	  && $(PERL) mktypes.pl --externs $(filter-out bsegentypes.cc, $(bse_sources)) \
 	) > xgen-$(@F) \
 	&& $(SFIDL) $(SFIDL_INC) --core-c --header $(srcdir)/bsecore.idl >> xgen-$(@F) \
 	&& (cmp -s xgen-$(@F) $(srcdir)/bsegentypes.h || cp xgen-$(@F) $(srcdir)/bsegentypes.h) \
 	&& rm -f xgen-$(@F)
 $(bse_sources): bsegentypes.h
-# bsegentypes.c
-GENERATED_EXTRA_DIST += bsegentypes.c
-$(libbse_la_OBJECTS): bsegentypes.c
-bsegentypes.c: @PERLRULE@ bsegentypes.h mktypes.pl bsecore.idl $(SFIDL)
+# bsegentypes.cc
+GENERATED_EXTRA_DIST += bsegentypes.cc
+$(libbse_la_OBJECTS): bsegentypes.cc
+bsegentypes.cc: @PERLRULE@ bsegentypes.h mktypes.pl bsecore.idl $(SFIDL)
 	( \
 	  cd $(srcdir) \
 	  && $(GLIB_MKENUMS) \
@@ -205,10 +205,10 @@ bsegentypes.c: @PERLRULE@ bsegentypes.h mktypes.pl bsecore.idl $(SFIDL)
 	) > xgen-$(@F) \
 	&& cp xgen-$(@F) $(@F) \
 	&& rm -f xgen-$(@F)
-# bseenum_arrays.c
-GENERATED_CLEANFILES += bseenum_arrays.c
-$(libbse_la_OBJECTS): bseenum_arrays.c
-bseenum_arrays.c: bsegentypes.h
+# bseenum_arrays.cc
+GENERATED_CLEANFILES += bseenum_arrays.cc
+$(libbse_la_OBJECTS): bseenum_arrays.cc
+bseenum_arrays.cc: bsegentypes.h
 	( \
 	  cd $(srcdir) \
 	  && $(GLIB_MKENUMS) \
@@ -221,10 +221,10 @@ bseenum_arrays.c: bsegentypes.h
 	) > xgen-$(@F) \
 	&& cp xgen-$(@F) $@ \
 	&& rm -f xgen-$(@F)
-# bseenum_list.c
-GENERATED_CLEANFILES += bseenum_list.c
-$(libbse_la_OBJECTS): bseenum_list.c
-bseenum_list.c: bsegentypes.h
+# bseenum_list.cc
+GENERATED_CLEANFILES += bseenum_list.cc
+$(libbse_la_OBJECTS): bseenum_list.cc
+bseenum_list.cc: bsegentypes.h
 	( \
 	  cd $(srcdir) \
 	  && $(GLIB_MKENUMS) \
@@ -234,28 +234,28 @@ bseenum_list.c: bsegentypes.h
 	) > xgen-$(@F) \
 	&& cp xgen-$(@F) $@ \
 	&& rm -f xgen-$(@F)
-# bsegentype_array.c
-GENERATED_EXTRA_DIST += bsegentype_array.c
-$(libbse_la_OBJECTS): bsegentype_array.c
-bsegentype_array.c: @PERLRULE@ bsegentypes.h
+# bsegentype_array.cc
+GENERATED_EXTRA_DIST += bsegentype_array.cc
+$(libbse_la_OBJECTS): bsegentype_array.cc
+bsegentype_array.cc: @PERLRULE@ bsegentypes.h
 	cd $(srcdir) \
 	&& $(PERL) mktypes.pl --array $(bse_sources) > xgen-$(@F) \
 	&& cp xgen-$(@F) $(@F) \
 	&& rm -f xgen-$(@F)
-# bsebuiltin_externs.c
-GENERATED_EXTRA_DIST += bsebuiltin_externs.c
-#$(libbse_la_OBJECTS): bsebuiltin_externs.c # forces complete rebuild when *.proc changes
-bseplugin.cc: bsebuiltin_externs.c
-bsebuiltin_externs.c: @PERLRULE@ $(bse_proc_gen_sources) mkcproc.pl
+# bsebuiltin_externs.cc
+GENERATED_EXTRA_DIST += bsebuiltin_externs.cc
+#$(libbse_la_OBJECTS): bsebuiltin_externs.cc # forces complete rebuild when *.proc changes
+bseplugin.cc: bsebuiltin_externs.cc
+bsebuiltin_externs.cc: @PERLRULE@ $(bse_proc_gen_sources) mkcproc.pl
 	cd $(srcdir) \
 	&& $(PERL) mkcproc.pl --externs $(bse_proc_gen_sources) > xgen-$(@F) \
 	&& cp xgen-$(@F) $(@F) \
 	&& rm -f xgen-$(@F)
-# bsebuiltin_array.c
-GENERATED_EXTRA_DIST += bsebuiltin_array.c
-#$(libbse_la_OBJECTS): bsebuiltin_array.c # forces complete rebuild when *.proc changes
-bseplugin.cc: bsebuiltin_array.c
-bsebuiltin_array.c: @PERLRULE@ $(bse_proc_gen_sources) mkcproc.pl
+# bsebuiltin_array.cc
+GENERATED_EXTRA_DIST += bsebuiltin_array.cc
+#$(libbse_la_OBJECTS): bsebuiltin_array.cc # forces complete rebuild when *.proc changes
+bseplugin.cc: bsebuiltin_array.cc
+bsebuiltin_array.cc: @PERLRULE@ $(bse_proc_gen_sources) mkcproc.pl
 	cd $(srcdir) \
 	&& $(PERL) mkcproc.pl --functions $(bse_proc_gen_sources) > xgen-$(@F) \
 	&& cp xgen-$(@F) $(@F) \
diff --git a/bse/bseengineutils.h b/bse/bseengineutils.h
index a19f0fa..e07f45d 100644
--- a/bse/bseengineutils.h
+++ b/bse/bseengineutils.h
@@ -46,7 +46,7 @@ EngineNode*	_engine_mnl_head		(void);
  * MasterThread - op engine control thread
  * SlaveThread  - op engine calculation threads
  *
- * these functions are for _internal_ use of bseengine*.c implementations
+ * these functions are for _internal_ use of bseengine*.cc implementations
  */
 
 /* --- job transactions --- */
diff --git a/bse/bseenums.cc b/bse/bseenums.cc
index 27031e4..7900c60 100644
--- a/bse/bseenums.cc
+++ b/bse/bseenums.cc
@@ -19,7 +19,7 @@
 #include <errno.h>
 
 /* include generated enum value arrays and *.h files the enums steam from */
-#include "bseenum_arrays.c"
+#include "bseenum_arrays.cc"
 
 /* --- functions --- */
 void
@@ -32,7 +32,7 @@ bse_type_register_enums (void)
     void       *values;
   } enums[] = {
     /* include generated enum list */
-#include "bseenum_list.c"
+#include "bseenum_list.cc"
   };
   uint n_enums = sizeof (enums) / sizeof (enums[0]);
   uint i;
diff --git a/bse/bseparam.cc b/bse/bseparam.cc
index f0fbd0b..040cd05 100644
--- a/bse/bseparam.cc
+++ b/bse/bseparam.cc
@@ -21,12 +21,12 @@
 #define NULL_CHECKED(x)         ((x) && (x)[0] ? x : NULL)
 
 /* --- prototypes --- */
-extern void	bse_param_types_init	(void);	/* sync with btype.c */
+extern void	bse_param_types_init	(void);	/* sync with btype.cc */
 
 
 /* --- type initialization --- */
 void
-bse_param_types_init (void)	/* sync with btype.c */
+bse_param_types_init (void)	/* sync with btype.cc */
 {
 }
 
diff --git a/bse/bseplugin.cc b/bse/bseplugin.cc
index 93705f9..8c432e3 100644
--- a/bse/bseplugin.cc
+++ b/bse/bseplugin.cc
@@ -133,7 +133,7 @@ bse_plugin_init (BsePlugin *plugin)
   plugin->types = NULL;
 }
 
-#include "bsebuiltin_externs.c" // include extern declarations of builtin init functions
+#include "bsebuiltin_externs.cc" // include extern declarations of builtin init functions
 
 void
 bse_plugin_init_builtins (void)
@@ -142,7 +142,7 @@ bse_plugin_init_builtins (void)
     {
       static BseExportNode* (* const builtin_inits[]) (void) = {
 	/* and list them in an array */
-#include "bsebuiltin_array.c"
+#include "bsebuiltin_array.cc"
       };
       static const guint n_builtin_inits = G_N_ELEMENTS (builtin_inits);
       guint i;
diff --git a/bse/bsestandardsynths.cc b/bse/bsestandardsynths.cc
index 3eec674..e02a203 100644
--- a/bse/bsestandardsynths.cc
+++ b/bse/bsestandardsynths.cc
@@ -32,7 +32,7 @@ typedef struct {
 
 
 /* --- generated ZFiles --- */
-#include "bse/zintern/bse-zfile.c"	/* bse_zfiles */
+#include "bse/zintern/bse-zfile.cc"	/* bse_zfiles */
 
 
 /* --- variables --- */
diff --git a/bse/bsetype.cc b/bse/bsetype.cc
index 3e3bcd4..b9c75a6 100644
--- a/bse/bsetype.cc
+++ b/bse/bsetype.cc
@@ -396,7 +396,7 @@ bse_param_spec_enum (const gchar    *name,
 
 /* --- SFIDL includes --- */
 /* include SFIDL generations */
-#include        "bsegentypes.c"
+#include        "bsegentypes.cc"
 
 
 void
@@ -407,7 +407,7 @@ bse_type_init (void)
     GType   *const type_p;
     GType   (*register_type) (void);
   } builtin_types[] = {
-#include "bsegentype_array.c"   // include class type id builtin variable declarations
+#include "bsegentype_array.cc"  // include class type id builtin variable declarations
   };
   const guint n_builtin_types = sizeof (builtin_types) / sizeof (builtin_types[0]);
   static GTypeFundamentalInfo finfo = { GTypeFundamentalFlags (0), };
diff --git a/bse/zintern/Makefile.am b/bse/zintern/Makefile.am
index cf05464..8f6c496 100644
--- a/bse/zintern/Makefile.am
+++ b/bse/zintern/Makefile.am
@@ -15,11 +15,11 @@ ZFILE_DEFS = $(strip \
 )
 
 gen_sources = xgen-bzc xgen-bzh
-CLEANFILES += $(gen_sources) bse-zfile.c bse-zfile.h
-noinst_DATA = bse-zfile.c # bse-zfile.h
+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.c:	$(top_builddir)/birnet/birnet-zintern $(srcdir)/*.bse # bse-zfile.h
+bse-zfile.cc:	$(top_builddir)/birnet/birnet-zintern $(srcdir)/*.bse # bse-zfile.h
 	$(top_builddir)/birnet/birnet-zintern -b -z $(ZFILE_DEFS) > xgen-bzc		\
 	&& echo "static const BseZFile bse_zfiles[] = {" >> xgen-bzc			\
 	&& for i in $(filter-out %.bse, $(ZFILE_DEFS)) ; do				\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]