git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move virt tools (virt-cat, virt-edit etc) into tools/ subdirectory.
[libguestfs.git]
/
haskell
/
Makefile.am
diff --git
a/haskell/Makefile.am
b/haskell/Makefile.am
index
06efdfd
..
dcaf18a
100644
(file)
--- a/
haskell/Makefile.am
+++ b/
haskell/Makefile.am
@@
-15,20
+15,25
@@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-EXTRA_DIST = *.hs
+EXTRA_DIST = *.hs
run-bindtests
CLEANFILES = *~
if HAVE_HASKELL
TESTS_ENVIRONMENT = \
CLEANFILES = *~
if HAVE_HASKELL
TESTS_ENVIRONMENT = \
- LD_LIBRARY_PATH=$(
abs_
top_builddir)/src/.libs \
- LIBGUESTFS_PATH=$(
abs_top_builddir)
\
+ LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
+ LIBGUESTFS_PATH=$(
top_builddir)/appliance
\
$(VG)
$(VG)
-TESTS = Guestfs005Load Guestfs010Launch Guestfs050LVCreate
+TESTS =
run-bindtests
Guestfs005Load Guestfs010Launch Guestfs050LVCreate
-GHCFLAGS = -I$(abs_top_builddir)/src -L$(abs_top_builddir)/src/.libs
+check_DATA = Bindtests
+
+GHCFLAGS = -I$(top_builddir)/src -L$(top_builddir)/src/.libs
+
+Bindtests: Bindtests.hs Guestfs.hs
+ $(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs
Guestfs005Load: Guestfs005Load.hs Guestfs.hs
$(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs
Guestfs005Load: Guestfs005Load.hs Guestfs.hs
$(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs
@@
-39,4
+44,4
@@
Guestfs010Launch: Guestfs010Launch.hs Guestfs.hs
Guestfs050LVCreate: Guestfs050LVCreate.hs Guestfs.hs
$(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs
Guestfs050LVCreate: Guestfs050LVCreate.hs Guestfs.hs
$(GHC) $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs
-endif
\ No newline at end of file
+endif