search for: sources_c

...| 2 ++ 12 files changed, 15 insertions(+) diff --git a/builder/Makefile.am b/builder/Makefile.am index b564fadd6..c7caec5cb 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -135,6 +135,7 @@ bin_PROGRAMS += virt-builder virt-builder-repository virt_builder_SOURCES = $(SOURCES_C) virt_builder_CPPFLAGS = \ + -DCAML_NAME_SPACE \ -I$(builddir) -I$(srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ @@ -156,6 +157,7 @@ XOBJECTS = $(BOBJECTS:.cmo=.cmx) virt_builder_repository_SOURCES = $(REPOSITORY_SOURCES_C) virt_builder_repositor...

...+++ b/.gitignore @@ -23,6 +23,7 @@ bindtests.tmp cscope.out .deps +.dirstamp .gdb_history .libs Makefile diff --git a/builder/Makefile.am b/builder/Makefile.am index 083e3a4..fcaa70a 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -72,13 +72,13 @@ SOURCES_ML = \ builder.ml SOURCES_C = \ - $(top_srcdir)/mllib/fsync-c.c \ - $(top_srcdir)/mllib/uri-c.c \ - $(top_srcdir)/mllib/mkdtemp-c.c \ - $(top_srcdir)/customize/perl_edit-c.c \ - $(top_srcdir)/customize/crypt-c.c \ - $(top_srcdir)/fish/uri.c \ - $(top_srcdir)/fish/file-edit.c \ + ../mllib/fsync-c.c \ + ../mllib/uri-c.c \ + ../...

...I assume this is "cosmetic". Manfred ----------- The patch: msm4:/usr/local/src/R-1.3.1/src/modules/lapack% diff -u Makefile.o Makefile --- Makefile.o Sat Dec 8 19:23:32 2001 +++ Makefile Sat Dec 8 19:27:26 2001 @@ -19,7 +19,7 @@ SOURCES_BLAS = blas2.f cmplxblas.f DEPENDS = $(SOURCES_C:.c=.d) -OBJECTS = $(SOURCES_C:.c=.lo) $(SOURCES_F:.f=.lo) \ +OBJECTS = $(SOURCES_C:.c=.lo) $(SOURCES_F:.f=.lo) # $(SOURCES_BLAS:.f=.lo) HEADERS = Lapack.h ------------ make stops with the following error: "cmplx.f", line 19283: warning(2290): actual argument is incompatible with...

Simplifies the build a bit. This is on top of the previous SELinux relabelling patch set, although not related to it. Rich.

.../.depend diff --git a/mlv2v/Makefile.am b/mlv2v/Makefile.am index 9e82148..945f981 100644 --- a/mlv2v/Makefile.am +++ b/mlv2v/Makefile.am @@ -18,11 +18,74 @@ include $(top_srcdir)/subdir-rules.mk EXTRA_DIST = \ - $(generator_built) + $(generator_built) \ + $(SOURCES_MLI) \ + $(SOURCES_ML) \ + $(SOURCES_C) -# Note: These are not compiled into a library. They are used directly -# by virt-v2v and are only located here because the files are -# generated (since the split). generator_built = \ uefi.mli \ uefi.ml + +SOURCES_MLI = \ + uefi.mli + +SOURCES_ML = \ + uefi.ml + +SOURCES_C = \ + dummy.c...

Rather complex patch to solve a small user error. Warn if the user is doing something like: virt-builder -o /dev/sdX1 Rich.

...akefile.am @@ -28,6 +28,8 @@ EXTRA_DIST = \ test-getopt.sh SOURCES_MLI = \ + xml.mli \ + xpath_helpers.mli \ checksums.mli \ common_utils.mli \ curl.mli \ @@ -67,7 +69,9 @@ SOURCES_ML = \ JSON.ml \ curl.ml \ exit.ml \ - checksums.ml + checksums.ml \ + xml.ml \ + xpath_helpers.ml SOURCES_C = \ ../cat/visit.c \ @@ -85,7 +89,8 @@ SOURCES_C = \ progress-c.c \ statvfs-c.c \ uri-c.c \ - visit-c.c + visit-c.c \ + xml-c.c if HAVE_OCAML diff --git a/v2v/xml-c.c b/mllib/xml-c.c similarity index 100% rename from v2v/xml-c.c rename to mllib/xml-c.c diff --git a/v2v/xml.ml b/mllib/x...

Just like the similar series that already went in for libguestfs [1], do similar fixes also for virt-v2v, with additional fixes for the builddir!=srcdir case. This will also need the fix to subdir-rules.mk. [1] https://www.redhat.com/archives/libguestfs/2019-December/msg00062.html Pino Toscano (7): Update common to latest build: stop shipping files generated by configure build: use the

...le.am +++ b/mllib/Makefile.am @@ -40,6 +40,7 @@ SOURCES_MLI = \ getopt.mli \ JSON.mli \ mkdtemp.mli \ + osinfo.mli \ planner.mli \ progress.mli \ regedit.mli \ @@ -71,7 +72,8 @@ SOURCES_ML = \ exit.ml \ checksums.ml \ xml.ml \ - xpath_helpers.ml + xpath_helpers.ml \ + osinfo.ml SOURCES_C = \ ../common/visit/visit.c \ @@ -79,6 +81,9 @@ SOURCES_C = \ ../common/options/keys.c \ ../common/options/uri.c \ ../common/progress/progress.c \ + ../lib/alloc.c \ + ../lib/osinfo.c \ + ../lib/osinfo.h \ common_utils-c.c \ dev_t-c.c \ exit-c.c \ @@ -86,6 +91,7 @@ SOURCES_C = \ fsy...

...math.h. The compiler flag -OPT:IEEE_NaN_inf=ON is supposed to enforce IEEE arithmetic but apparently isn't enough. Minor problems -------------- 3) Make IRIX make does not like continuation lines followed only by a comment. So, for example, these lines from src/appl/Makefile.in OBJECTS = $(SOURCES_C:.c=.o) $(SOURCES_F:.f=.o)\ @USE_EXTERNAL_BLAS_FALSE@ blas.o @COMPILE_DOUBLE_COMPLEX_FALSE@ zgemm.o which become OBJECTS = $(SOURCES_C:.c=.o) $(SOURCES_F:.f=.o) \ # blas.o zgemm.o in the Makefile, cause an error. I have worked around this by joining the two lines, but the problem recurs several...

...pend. Fixes commit cc04573927cca97de60d544d37467e67c25867a7. --- v2v/Makefile.am | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 34cad197b..88b31f86c 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -143,12 +143,12 @@ SOURCES_C = \ # These files are generated and contain rhv-upload-*.py embedded as an # OCaml string. -output_rhv_upload_createvm_source.ml: rhv-upload-createvm.py - ./embed.sh code $^ $@ -output_rhv_upload_plugin_source.ml: rhv-upload-plugin.py - ./embed.sh code $^ $@ -output_rhv_upload_precheck_source.m...

Hello, In the src folder of my R package I have a.cc b.cc f/g/x.cc my Makevars.in has all: $(SHLIB) upon installing only, a.o and b.o is build and the final dll is comprised of a.o and b.o How can I instruct $(SHLIB) to pick up its source files from all subdirectories (or maybe a subset, though here it will be all) in src ? Much thanks Saptarshi

...s(+), 11 deletions(-) create mode 100644 sparsify/cmdline.mli diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am index 33f418b..d99f311 100644 --- a/sparsify/Makefile.am +++ b/sparsify/Makefile.am @@ -18,13 +18,16 @@ include $(top_srcdir)/subdir-rules.mk EXTRA_DIST = \ - $(SOURCES_ML) $(SOURCES_C) \ + $(SOURCES_MLI) $(SOURCES_ML) $(SOURCES_C) \ virt-sparsify.pod \ test-virt-sparsify.sh \ test-virt-sparsify-in-place.sh CLEANFILES = *~ *.annot *.cmi *.cmo *.cmx *.cmxa *.o virt-sparsify +SOURCES_MLI = \ + cmdline.mli + SOURCES_ML = \ utils.ml \ cmdline.ml \ diff --git a/sparsif...

...5f..eb9753e45 100644 --- a/mllib/Makefile.am +++ b/mllib/Makefile.am @@ -19,7 +19,7 @@ include $(top_srcdir)/subdir-rules.mk EXTRA_DIST = \ $(SOURCES_MLI) \ - $(filter-out guestfs_config.ml libdir.ml,$(SOURCES_ML)) \ + $(filter-out guestfs_config.ml libdir.ml osinfopath.ml,$(SOURCES_ML)) \ $(SOURCES_C) \ common_utils_tests.ml \ getopt_tests.ml \ @@ -40,6 +40,7 @@ SOURCES_MLI = \ getopt.mli \ JSON.mli \ mkdtemp.mli \ + osinfo.mli \ planner.mli \ progress.mli \ regedit.mli \ @@ -71,7 +72,9 @@ SOURCES_ML = \ exit.ml \ checksums.ml \ xml.ml \ - xpath_helpers.ml + xpath_helpers....

...akefile.am @@ -28,6 +28,8 @@ EXTRA_DIST = \ test-getopt.sh SOURCES_MLI = \ + xml.mli \ + xpath_helpers.mli \ checksums.mli \ common_utils.mli \ curl.mli \ @@ -67,7 +69,9 @@ SOURCES_ML = \ JSON.ml \ curl.ml \ exit.ml \ - checksums.ml + checksums.ml \ + xml.ml \ + xpath_helpers.ml SOURCES_C = \ ../common/visit/visit.c \ @@ -85,7 +89,8 @@ SOURCES_C = \ progress-c.c \ statvfs-c.c \ uri-c.c \ - visit-c.c + visit-c.c \ + xml-c.c if HAVE_OCAML diff --git a/v2v/xml-c.c b/mllib/xml-c.c similarity index 90% rename from v2v/xml-c.c rename to mllib/xml-c.c index 0fcdbedec..d3e89307...

...efile.am +++ b/mllib/Makefile.am @@ -36,6 +36,7 @@ SOURCES_MLI = \ curl.mli \ getopt.mli \ JSON.mli \ + osinfo.mli \ planner.mli \ progress.mli \ regedit.mli \ @@ -63,7 +64,8 @@ SOURCES_ML = \ curl.ml \ checksums.ml \ xml.ml \ - xpath_helpers.ml + xpath_helpers.ml \ + osinfo.ml SOURCES_C = \ ../common/visit/visit.c \ @@ -71,8 +73,12 @@ SOURCES_C = \ ../common/options/keys.c \ ../common/options/uri.c \ ../common/progress/progress.c \ + ../lib/alloc.c \ + ../lib/osinfo.c \ + ../lib/osinfo.h \ common_utils-c.c \ getopt-c.c \ + osinfo-c.c \ progress-c.c \ unix_utils-c.c...

...efile.am +++ b/mllib/Makefile.am @@ -36,6 +36,7 @@ SOURCES_MLI = \ curl.mli \ getopt.mli \ JSON.mli \ + osinfo.mli \ planner.mli \ progress.mli \ regedit.mli \ @@ -63,7 +64,8 @@ SOURCES_ML = \ curl.ml \ checksums.ml \ xml.ml \ - xpath_helpers.ml + xpath_helpers.ml \ + osinfo.ml SOURCES_C = \ ../common/visit/visit.c \ @@ -71,8 +73,12 @@ SOURCES_C = \ ../common/options/keys.c \ ../common/options/uri.c \ ../common/progress/progress.c \ + ../lib/alloc.c \ + ../lib/osinfo.c \ + ../lib/osinfo.h \ common_utils-c.c \ getopt-c.c \ + osinfo-c.c \ progress-c.c \ unix_utils-c.c...

...efile.am +++ b/mllib/Makefile.am @@ -36,6 +36,7 @@ SOURCES_MLI = \ curl.mli \ getopt.mli \ JSON.mli \ + osinfo.mli \ planner.mli \ progress.mli \ regedit.mli \ @@ -63,7 +64,8 @@ SOURCES_ML = \ curl.ml \ checksums.ml \ xml.ml \ - xpath_helpers.ml + xpath_helpers.ml \ + osinfo.ml SOURCES_C = \ ../common/visit/visit.c \ @@ -71,8 +73,12 @@ SOURCES_C = \ ../common/options/keys.c \ ../common/options/uri.c \ ../common/progress/progress.c \ + ../lib/alloc.c \ + ../lib/osinfo.c \ + ../lib/osinfo.h \ common_utils-c.c \ getopt-c.c \ + osinfo-c.c \ progress-c.c \ unix_utils-c.c...

...+++++++++++++++++++++++++++++++++++++++++++ sysprep/Makefile.am | 8 +++- 4 files changed, 173 insertions(+), 2 deletions(-) diff --git a/customize/Makefile.am b/customize/Makefile.am index 8f0a2d8..d664ba4 100644 --- a/customize/Makefile.am +++ b/customize/Makefile.am @@ -67,6 +67,10 @@ SOURCES_C = \ $(top_srcdir)/fish/file-edit.c \ $(top_srcdir)/fish/file-edit.h \ $(top_srcdir)/mllib/uri-c.c \ + $(top_srcdir)/mllib/index-parse.c \ + $(top_srcdir)/mllib/index-scan.c \ + $(top_srcdir)/mllib/index-struct.c \ + $(top_srcdir)/mllib/index-parser-c.c \ crypt-c.c \ perl_edit-c.c @@ -85...

...have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +include $(top_srcdir)/subdir-rules.mk + +EXTRA_DIST = \ + $(SOURCES_MLI) \ + $(SOURCES_ML) \ + $(SOURCES_C) + +SOURCES_MLI = \ + c_utils.mli \ + unix_utils.mli + +SOURCES_ML = \ + c_utils.ml \ + unix_utils.ml + +SOURCES_C = \ + c_utils-c.c \ + unix_utils-c.c + +if HAVE_OCAML + +# We pretend that we're building a C library. automake handles the +# compilation of the C sources for us. At the end we...