mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove many uses of $(builddir).

Browse Source 
"$(builddir)" is always "."

Therefore most uses of $(builddir) are suspect and should be
removed or replaced with "."
This commit is contained in:
Richard W.M. Jones
2013-04-25 10:40:18 +01:00
parent c1898ee996
commit a1e51676fd
7 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
generator/Makefile.am
View File

@@ -89,7 +89,7 @@ objects = \
EXTRA_DIST = $(sources) files-generated.txt
OCAMLCFLAGS = -warn-error CDEFLMPSUVYZX -I $(srcdir) -I $(builddir) -package unix,str
OCAMLCFLAGS = -warn-error CDEFLMPSUVYZX -I $(srcdir) -I . -package unix,str
noinst_PROGRAM = generator
@@ -100,11 +100,11 @@ generator: $(objects)
# Dependencies.
%.cmi: %.mli
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -c $< -o $(builddir)/$@
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -c $< -o $@
%.cmi: %.ml
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -c $< -o $(builddir)/$@
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -c $< -o $@
%.cmo: %.ml
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -c $< -o $(builddir)/$@
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -c $< -o $@
depend: .depend

8
inspector/Makefile.am
View File

@@ -116,21 +116,21 @@ check-valgrind-local-guests:
example-debian.xml:
rm -f $@ $@-t
$(top_builddir)/run --test \
$(builddir)/virt-inspector ../tests/guests/debian.img > $@-t
./virt-inspector ../tests/guests/debian.img > $@-t
mv $@-t $@
example-fedora.xml:
rm -f $@ $@-t
$(top_builddir)/run --test \
$(builddir)/virt-inspector ../tests/guests/fedora.img > $@-t
./virt-inspector ../tests/guests/fedora.img > $@-t
mv $@-t $@
example-ubuntu.xml:
rm -f $@ $@-t
$(top_builddir)/run --test \
$(builddir)/virt-inspector ../tests/guests/ubuntu.img > $@-t
./virt-inspector ../tests/guests/ubuntu.img > $@-t
mv $@-t $@
example-windows.xml:
rm -f $@ $@-t
$(top_builddir)/run --test \
$(builddir)/virt-inspector ../tests/guests/windows.img | \
./virt-inspector ../tests/guests/windows.img | \
fgrep -v '<uuid>' > $@-t
mv $@-t $@

10
java/Makefile.am
View File

@@ -52,7 +52,7 @@ EXTRA_DIST = \
CLEANFILES = \
doc-stamp \
$(builddir)/com/redhat/et/libguestfs/*.class \
com/redhat/et/libguestfs/*.class \
com_redhat_et_libguestfs_GuestFS.h \
*.class \
*.jar
@@ -71,7 +71,7 @@ libguestfs_jardir = $(JAR_INSTALL_DIR)
libguestfs_jar_DATA = libguestfs-${VERSION}.jar
libguestfs_jar_class_files = $(java_sources:.java=.class)
$(libguestfs_jar_class_files): %.class: %.java
$(JAVAC) $(JAVAC_FLAGS) -d $(builddir) -classpath $(srcdir):$(builddir) $<
$(JAVAC) $(JAVAC_FLAGS) -d . -classpath $(srcdir):. $<
libguestfs-${VERSION}.jar: $(libguestfs_jar_class_files)
$(JAR) cf $@ $^
@@ -102,7 +102,7 @@ BUILT_SOURCES = com_redhat_et_libguestfs_GuestFS.h
com_redhat_et_libguestfs_GuestFS.h: $(java_prefix)/GuestFS.class
rm -f $@
$(JAVAH) -classpath $(srcdir):$(builddir) com.redhat.et.libguestfs.GuestFS
$(JAVAH) -classpath $(srcdir):. com.redhat.et.libguestfs.GuestFS
# Documentation.
@@ -132,9 +132,9 @@ TESTS_ENVIRONMENT = $(top_builddir)/run --test
noinst_DATA = Bindtests.class $(java_tests:.java=.class)
t/%.class: t/%.java libguestfs-$(VERSION).jar
$(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar -d $(builddir)/t $<
$(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar -d t $<
Bindtests.class: Bindtests.java libguestfs-$(VERSION).jar
$(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar -d $(builddir) $<
$(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar -d . $<
endif

10
ocaml/Makefile.am
View File

@@ -186,15 +186,15 @@ check-valgrind:
# Dependencies.
%.cmi: %.mli
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -package unix -c $< -o $(builddir)/$@
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -package unix -c $< -o $@
guestfs.cmo: guestfs.ml
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -package unix -c $< -o $(builddir)/$@
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -package unix -c $< -o $@
%.cmo: %.ml mlguestfs.cma
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -package unix -c $< -o $(builddir)/$@
$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -package unix -c $< -o $@
guestfs.cmx: guestfs.ml
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -package unix -c $< -o $(builddir)/$@
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -package unix -c $< -o $@
%.cmx: %.ml mlguestfs.cmxa
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -package unix -c $< -o $(builddir)/$@
$(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -package unix -c $< -o $@
depend: .depend

16
po-docs/ja/Makefile.am
View File

@@ -83,9 +83,9 @@ guestfs.3: guestfs.pod guestfs-actions.pod guestfs-availability.pod guestfs-stru
--man $@ \
--section 3 \
--license LGPLv2+ \
--insert $(builddir)/guestfs-actions.pod:__ACTIONS__ \
--insert $(builddir)/guestfs-availability.pod:__AVAILABILITY__ \
--insert $(builddir)/guestfs-structs.pod:__STRUCTS__ \
--insert guestfs-actions.pod:__ACTIONS__ \
--insert guestfs-availability.pod:__AVAILABILITY__ \
--insert guestfs-structs.pod:__STRUCTS__ \
$<
guestfish.1: guestfish.pod guestfish-actions.pod guestfish-commands.pod guestfish-prepopts.pod
@@ -93,9 +93,9 @@ guestfish.1: guestfish.pod guestfish-actions.pod guestfish-commands.pod guestfis
--no-strict-checks \
--man $@ \
--license GPLv2+ \
--insert $(builddir)/guestfish-actions.pod:__ACTIONS__ \
--insert $(builddir)/guestfish-commands.pod:__FISH_COMMANDS__ \
--insert $(builddir)/guestfish-prepopts.pod:__PREPOPTS__ \
--insert guestfish-actions.pod:__ACTIONS__ \
--insert guestfish-commands.pod:__FISH_COMMANDS__ \
--insert guestfish-prepopts.pod:__PREPOPTS__ \
$<
virt-sysprep.1: virt-sysprep.pod sysprep-extra-options.pod sysprep-operations.pod
@@ -103,8 +103,8 @@ virt-sysprep.1: virt-sysprep.pod sysprep-extra-options.pod sysprep-operations.po
--no-strict-checks \
--man $@ \
--license GPLv2+ \
--insert $(builddir)/sysprep-extra-options.pod:__EXTRA_OPTIONS__ \
--insert $(builddir)/sysprep-operations.pod:__OPERATIONS__ \
--insert sysprep-extra-options.pod:__EXTRA_OPTIONS__ \
--insert sysprep-operations.pod:__OPERATIONS__ \
$<
%.1: %.pod

16
po-docs/uk/Makefile.am
View File

@@ -83,9 +83,9 @@ guestfs.3: guestfs.pod guestfs-actions.pod guestfs-availability.pod guestfs-stru
--man $@ \
--section 3 \
--license LGPLv2+ \
--insert $(builddir)/guestfs-actions.pod:__ACTIONS__ \
--insert $(builddir)/guestfs-availability.pod:__AVAILABILITY__ \
--insert $(builddir)/guestfs-structs.pod:__STRUCTS__ \
--insert guestfs-actions.pod:__ACTIONS__ \
--insert guestfs-availability.pod:__AVAILABILITY__ \
--insert guestfs-structs.pod:__STRUCTS__ \
$<
guestfish.1: guestfish.pod guestfish-actions.pod guestfish-commands.pod guestfish-prepopts.pod
@@ -93,9 +93,9 @@ guestfish.1: guestfish.pod guestfish-actions.pod guestfish-commands.pod guestfis
--no-strict-checks \
--man $@ \
--license GPLv2+ \
--insert $(builddir)/guestfish-actions.pod:__ACTIONS__ \
--insert $(builddir)/guestfish-commands.pod:__FISH_COMMANDS__ \
--insert $(builddir)/guestfish-prepopts.pod:__PREPOPTS__ \
--insert guestfish-actions.pod:__ACTIONS__ \
--insert guestfish-commands.pod:__FISH_COMMANDS__ \
--insert guestfish-prepopts.pod:__PREPOPTS__ \
$<
virt-sysprep.1: virt-sysprep.pod sysprep-extra-options.pod sysprep-operations.pod
@@ -103,8 +103,8 @@ virt-sysprep.1: virt-sysprep.pod sysprep-extra-options.pod sysprep-operations.po
--no-strict-checks \
--man $@ \
--license GPLv2+ \
--insert $(builddir)/sysprep-extra-options.pod:__EXTRA_OPTIONS__ \
--insert $(builddir)/sysprep-operations.pod:__OPERATIONS__ \
--insert sysprep-extra-options.pod:__EXTRA_OPTIONS__ \
--insert sysprep-operations.pod:__OPERATIONS__ \
$<
%.1: %.pod

2
ruby/Makefile.am
View File

@@ -61,7 +61,7 @@ install:
$(MKDIR_P) $(DESTDIR)$(RUBY_LIBDIR)
$(MKDIR_P) $(DESTDIR)$(RUBY_ARCHDIR)
$(INSTALL) -p -m 0644 $(srcdir)/lib/guestfs.rb $(DESTDIR)$(RUBY_LIBDIR)
$(INSTALL) -p -m 0755 $(builddir)/ext/guestfs/_guestfs.so $(DESTDIR)$(RUBY_ARCHDIR)
$(INSTALL) -p -m 0755 ext/guestfs/_guestfs.so $(DESTDIR)$(RUBY_ARCHDIR)
TESTS = run-bindtests run-ruby-tests