Make it clear it is a generated source. Signed-off-by: Pino Toscano <ptoscano@xxxxxxxxxx> --- .gitignore | 2 +- Makefile.in | 2 +- libvirt/Makefile.in | 18 +++++++++--------- libvirt/README | 6 +++--- libvirt/generator.pl | 4 ++-- libvirt/libvirt.mli | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 840c0c4..c52c1b8 100644 --- a/.gitignore +++ b/.gitignore @@ -28,7 +28,7 @@ core.* /examples/list_secrets /examples/node_info /html/ -/libvirt/libvirt_c.c +/libvirt/libvirt_generated.c /libvirt/libvirt_version.ml /ocaml-libvirt-*.exe /ocaml-libvirt-*.tar.gz diff --git a/Makefile.in b/Makefile.in index e50600a..4357ba6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -35,7 +35,7 @@ clean: for d in . $(SUBDIRS); do \ (cd $$d; rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so *.opt *~ *.dll *.exe core); \ done - rm -f libvirt/libvirt_c.c + rm -f libvirt/libvirt_generated.c rm -f examples/list_domains rm -f examples/node_info rm -f examples/get_cpu_stats diff --git a/libvirt/Makefile.in b/libvirt/Makefile.in index ad56bb5..d78056b 100644 --- a/libvirt/Makefile.in +++ b/libvirt/Makefile.in @@ -64,10 +64,10 @@ OPTOBJS := libvirt.cmx libvirt_version.cmx ifneq ($(OCAMLMKLIB),) # Good, we can just use ocamlmklib -mllibvirt.cma: libvirt_c.o libvirt_c_oneoffs.o libvirt_c_epilogue.o $(COBJS) +mllibvirt.cma: libvirt_generated.o libvirt_c_oneoffs.o libvirt_c_epilogue.o $(COBJS) $(OCAMLMKLIB) -o mllibvirt $^ $(LDFLAGS) -mllibvirt.cmxa: libvirt_c.o libvirt_c_oneoffs.o libvirt_c_epilogue.o $(OPTOBJS) +mllibvirt.cmxa: libvirt_generated.o libvirt_c_oneoffs.o libvirt_c_epilogue.o $(OPTOBJS) $(OCAMLMKLIB) -o mllibvirt $^ $(LDFLAGS) else @@ -83,11 +83,11 @@ mllibvirt.cmxa: libmllibvirt.a $(OPTOBJS) $(OCAMLOPT) -a -linkall -o $@ $(OPTOBJS) \ -cclib -lmllibvirt -cclib "$(LDFLAGS)" -dllmllibvirt.dll: libvirt_c.o libvirt_c_oneoffs.o libvirt_c_epilogue.o +dllmllibvirt.dll: libvirt_generated.o libvirt_c_oneoffs.o libvirt_c_epilogue.o $(CC) -shared -o $@ $^ \ $(LDFLAGS) "$(shell ocamlc -where)"/ocamlrun.a -libmllibvirt.a: libvirt_c.o libvirt_c_oneoffs.o libvirt_c_epilogue.o +libmllibvirt.a: libvirt_generated.o libvirt_c_oneoffs.o libvirt_c_epilogue.o ar rc $@ $^ ranlib $@ @@ -100,24 +100,24 @@ endif endif # Automatically generate the C code from a Perl script 'generator.pl'. -libvirt_c.c: generator.pl +libvirt_generated.c: generator.pl $(PERL) -w $< # Extra dependencies. -libvirt_c.o: libvirt_c.h +libvirt_generated.o: libvirt_c.h libvirt_c_oneoffs.o: libvirt_c.h libvirt_c_epilogue.o: libvirt_c.h # Status of automatically generated bindings. -autostatus: libvirt_c.c +autostatus: libvirt_generated.c @echo -n "Functions which have manual bindings: " @grep ^ocaml_libvirt_ libvirt_c_oneoffs.c | wc -l @echo -n "Functions which have automatic bindings: " - @grep ^ocaml_libvirt_ libvirt_c.c | wc -l + @grep ^ocaml_libvirt_ libvirt_generated.c | wc -l @echo -n "LOC in manual bindings: " @wc -l < libvirt_c_oneoffs.c @echo -n "LOC in automatic bindings: " - @wc -l < libvirt_c.c + @wc -l < libvirt_generated.c install-byte: diff --git a/libvirt/README b/libvirt/README index 3fb8f53..197a07a 100644 --- a/libvirt/README +++ b/libvirt/README @@ -19,9 +19,9 @@ one-of-a-kind to be worth generating automatically. Generated code -------------- -The C bindings in 'libvirt_c.c' are now generated automatically by a -Perl script called 'generator.pl'. You do not normally need to run -this script, but you may need to if you want to extend libvirt +The C bindings in 'libvirt_generated.c' are now generated automatically +by a Perl script called 'generator.pl'. You do not normally need to +run this script, but you may need to if you want to extend libvirt coverage. The majority of the functions are now generated automatically, but diff --git a/libvirt/generator.pl b/libvirt/generator.pl index eb329a0..cb2b845 100755 --- a/libvirt/generator.pl +++ b/libvirt/generator.pl @@ -19,7 +19,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# This generates libvirt_c.c (the core of the bindings). You don't +# This generates libvirt_generated.c (the core of the bindings). You don't # need to run this program unless you are extending the bindings # themselves (eg. because libvirt has been extended). # @@ -199,7 +199,7 @@ my @unimplemented = ( # Open the output file. -my $filename = "libvirt_c.c"; +my $filename = "libvirt_generated.c"; open F, ">$filename" or die "$filename: $!"; # Write the prologue. diff --git a/libvirt/libvirt.mli b/libvirt/libvirt.mli index 72e83f9..0739702 100644 --- a/libvirt/libvirt.mli +++ b/libvirt/libvirt.mli @@ -1574,7 +1574,7 @@ sig | VIR_ERR_NONE | VIR_ERR_WARNING | VIR_ERR_ERROR - (* ^^ NB: If you add a variant you MUST edit libvirt_c.c: MAX_VIR_* *) + (* ^^ NB: If you add a variant you MUST edit libvirt_generated.c: MAX_VIR_* *) | VIR_ERR_UNKNOWN_LEVEL of int (** Other level, not handled with existing values. *) (** No error, a warning or an error. *) -- 2.21.0 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list