X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile;h=88284f6882399a4972cce525104865cfabbe5bc8;hb=67839c39351c9e191dd72c36d33979ca5f84f99c;hp=a9b99ebf7ea524e901171b6172e4ad8bf370a31c;hpb=0d2e46d0e9958d635550bbe3df0a985f129914c0;p=goaljobs-goals.git

diff --git a/Makefile b/Makefile
index a9b99eb..88284f6 100644
--- a/Makefile
+++ b/Makefile
@@ -3,20 +3,32 @@
 # Comment out the next line if goaljobs is installed.  If it is not
 # installed, change the path to the location of the goaljobs build
 # directory.
-pkgdir = ../goaljobs
+#pkgdir = ../goaljobs
 
 ifeq ($(pkgdir),)
-goaljobs = goaljobs
+goaljobs = goaljobs --package pcre,extlib
 else
-goaljobs = $(pkgdir)/goaljobs --pkgdir=$(pkgdir)
+goaljobs = $(pkgdir)/goaljobs --pkgdir=$(pkgdir) --package pcre,extlib
 endif
 
-all: \
+programs = \
 	fedora_ocaml_rebuild \
-	libguestfs_upstream
+	libguestfs_upstream \
+	libguestfs_fedora
+
+all: $(programs)
 
 fedora_ocaml_rebuild: config.ml utils.ml git.ml fedora.ml fedora_ocaml_rebuild.ml
-	$(goaljobs) --package pcre,extlib $^ -o $@
+	$(goaljobs) $^ -o $@
+
+libguestfs_upstream: config.ml utils.ml libguestfs.ml libguestfs_upstream.ml
+	$(goaljobs) $^ -o $@
 
-libguestfs_upstream: config.ml libguestfs_upstream.ml
+libguestfs_fedora: config.ml utils.ml git.ml fedora.ml libguestfs.ml libguestfs_fedora.ml
 	$(goaljobs) $^ -o $@
+
+clean:
+	rm -f $(programs) *.cmi *.cmx *.o *~
+
+# Parallel building is broken in this Makefile.
+.NOTPARALLEL: