search for: ghcflag

...s(+), 15 deletions(-) diff --git a/haskell/Makefile.am b/haskell/Makefile.am index 531e404..5328ca0 100644 --- a/haskell/Makefile.am +++ b/haskell/Makefile.am @@ -46,25 +46,51 @@ $(all_targets): $(top_builddir)/src/libguestfs.la all: $(all_targets) -Guestfs.o: $(srcdir)/Guestfs.hs - $(GHC) $(GHCFLAGS) -c $< -o $@ +built_tests = Bindtests Guestfs010Load Guestfs030Config Guestfs050LVCreate -Bindtests: $(srcdir)/Bindtests.hs Guestfs.o - $(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs +# Building with ghc --make doesn't work properly here because it +# alway...

From: Hilko Bengen <bengen at hilluzination.de> --- erlang/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/erlang/Makefile.am b/erlang/Makefile.am index f336375..2c9e359 100644 --- a/erlang/Makefile.am +++ b/erlang/Makefile.am @@ -32,7 +32,7 @@ erlang_bindir = $(libdir)/erlang/lib/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/ebin erlang_bin_DATA = guestfs.beam

This new series condenses all of the previously posted patches into new patch 1/2. The second patch is a new fix for parallel build in the haskell directory.

...stamp-generator + +# $(GENERATOR_ML) isn't redundant below as the wildcard rule won't match, and +# therefore won't generate, the files if they haven't been created yet +EXTRA_DIST = $(GENERATOR_ML) *.hs run-bindtests CLEANFILES = *~ @@ -32,6 +43,8 @@ check_DATA = Bindtests GHCFLAGS = -I$(top_builddir)/src -L$(top_builddir)/src/.libs +all: Bindtests Guestfs005Load Guestfs010Launch Guestfs050LVCreate + Bindtests: Bindtests.hs Guestfs.hs $(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs diff --git a/java/Makefile.am b/java/Makefile.am index 6...

This just fixes 'make'. 'make check' is still broken. Further patches for that to follow tomorrow. Rich.

Patch 1/5 is a repost. Only change is title update. These fix parallel make on my machine, and additionally make building from subdirectories more correct.

...estfs-golang.3.html diff --git a/haskell/Makefile.am b/haskell/Makefile.am index 64f54bf..b09b06b 100644 --- a/haskell/Makefile.am +++ b/haskell/Makefile.am @@ -87,7 +87,7 @@ built_tests = Bindtests Guestfs010Load Guestfs030Config Guestfs050LVCreate $(built_tests): %: %.hs Guestfs.hs $(GHC) $(GHCFLAGS) --make -main-is $@ -odir .$@ -o $@ $< $(srcdir)/Guestfs.hs -lguestfs -CLEANFILES = $(all_targets) *~ *.hi *.o test-lv-create.img +CLEANFILES += $(all_targets) *.hi test-lv-create.img clean-local: -rm -rf $(built_tests:%=.%) diff --git a/inspector/Makefile.am b/inspector/Makefile.am inde...

This reverts commit 3f6ca541c7b24d4c86688a509582cb41a7e0078c. The original commit was reverted prematurely. --- generator/generator_actions.ml | 10 +++++----- generator/generator_checks.ml | 5 +++++ generator/generator_types.ml | 3 +++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/generator/generator_actions.ml b/generator/generator_actions.ml index

This patch series moves some files and directories around but is only code motion (or supposed to be). A new directory, common/, is created for all of the common code which is currently shared in random ways between parts of the project. And src/ becomes lib/ (the largest change, but mostly mechanical). In full this series makes the following changes: src/libprotocol -> common/protocol

Previous patch series was posted here: https://www.redhat.com/archives/libguestfs/2017-January/msg00059.html v2 simply extends this patch series to cover the extra directories common/edit, common/progress, common/windows and common/parallel. The only remaining item is to consider whether we should rename mllib to something else, mlcommon was my suggestion. Rich.