X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=haskell%2FMakefile.am;h=5c1ff9878f5801b7552ff0c24e0b817eb3a89030;hb=c4381dba737d5cb8aad8e1b2e2123b0fcaff1d1a;hp=2524617a32edbe3326a319a90287862fcf332c2e;hpb=8b3e75a3c78064a9dcf4952c50fe631442313743;p=libguestfs.git

diff --git a/haskell/Makefile.am b/haskell/Makefile.am
index 2524617..5c1ff98 100644
--- a/haskell/Makefile.am
+++ b/haskell/Makefile.am
@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 include $(top_srcdir)/subdir-rules.mk
 
@@ -30,34 +30,32 @@ if HAVE_HASKELL
 TESTS_ENVIRONMENT = \
 	LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
 	LIBGUESTFS_PATH=$(top_builddir)/appliance \
+	TMPDIR=$(top_builddir) \
 	$(VG)
 
-TESTS = run-bindtests Guestfs005Load Guestfs010Launch Guestfs050LVCreate
+TESTS = run-bindtests Guestfs005Load Guestfs010Basic
 
 check_DATA = Bindtests
 
-GHCFLAGS = -I$(top_builddir)/src -L$(top_builddir)/src/.libs
+GHCFLAGS = -I$(top_builddir)/src -L$(top_builddir)/src/.libs -i$(srcdir)
 
-all_targets = Bindtests Guestfs005Load Guestfs010Launch Guestfs050LVCreate
+all_targets = Bindtests Guestfs005Load Guestfs010Basic
 $(all_targets): $(top_builddir)/src/libguestfs.la
 
 all: $(all_targets)
 
-Guestfs.o: Guestfs.hs
-	$(GHC)  $(GHCFLAGS) -c $<
+Guestfs.o: $(srcdir)/Guestfs.hs
+	$(GHC)  $(GHCFLAGS) -c $< -o $@
 
-Bindtests: Bindtests.hs Guestfs.o
+Bindtests: $(srcdir)/Bindtests.hs Guestfs.o
 	$(GHC)  $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs
 
-Guestfs005Load: Guestfs005Load.hs Guestfs.o
+Guestfs005Load: $(srcdir)/Guestfs005Load.hs Guestfs.o
 	$(GHC)  $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs
 
-Guestfs010Launch: Guestfs010Launch.hs Guestfs.o
+Guestfs010Basic: $(srcdir)/Guestfs010Basic.hs Guestfs.o
 	$(GHC)  $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs
 
-Guestfs050LVCreate: Guestfs050LVCreate.hs Guestfs.o
-	$(GHC)  $(GHCFLAGS) -main-is $(shell basename $@) --make -o $@ $< -lguestfs
-
-CLEANFILES = $(all_targets) *~ Guestfs.o
+CLEANFILES = $(all_targets) *~ *.hi *.o
 
 endif