X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=makefile;h=75035159d68c96f2a256c76abb03e6fdb911f4ae;hb=b6ba5347fa75f33f63b2eb358d5ab421392dd52e;hp=608606c6ffcf7f7c7c3a7445f24231c5cd288d18;hpb=77bff3e2abda103471ab881bad81db67003582ff;p=dead%2Fhtsn-import.git

diff --git a/makefile b/makefile
index 608606c..7503515 100644
--- a/makefile
+++ b/makefile
@@ -8,16 +8,21 @@ $(BIN): $(PN).cabal $(SRCS)
 	runghc Setup.hs configure --user --prefix=/
 	runghc Setup.hs build
 
-profile: $(PN).cabal $(SRCS)
-	runghc Setup.hs configure --user --enable-executable-profiling --prefix=/
+# The $(BIN) dependency means that we should build once normally
+# before attempting the profiling build (this is required for some
+# reason).
+profile: $(PN).cabal $(SRCS) $(BIN)
+	runghc Setup.hs configure --user \
+                                  --enable-executable-profiling \
+                                  --prefix=/
 	runghc Setup.hs build
 
 doc: $(PN).cabal $(SRCS)
 	runghc Setup.hs configure --user --prefix=/
-	runghc Setup.hs hscolour --executables
-	runghc Setup.hs haddock --internal    \
-				--executables \
-				--hyperlink-source
+	runghc Setup.hs hscolour --all
+	runghc Setup.hs haddock --all    \
+				--hyperlink-source \
+                                --haddock-options="--ignore-all-exports"
 
 #
 # Testing.
@@ -38,7 +43,7 @@ test: $(BIN) $(TESTSUITE_BIN)
 #
 dist:
 	runghc Setup.hs configure --prefix=/
-	runghc Setup.hs sdist
+	TAR_OPTIONS="--format=ustar" runghc Setup.hs sdist
 
 hlint:
 	hlint --ignore="Use camelCase"     \
@@ -52,6 +57,9 @@ clean:
 	rm -f *.xml
 	rm -rf tmp
 	rm -f schemagen/*.dtd
+	find ./ -name '*.prof' -delete
+	find ./ -name '*.o' -delete
+	find ./ -name '*.hi' -delete
 
 
 #
@@ -68,6 +76,6 @@ DTDS := $(addsuffix .dtd, $(XMLTYPES))
 # $<. Its use is legitimate since we do sort of depend on the
 # directory existing.
 $(DTDS): %.dtd: % $(XMLS)
-	learn $</*.xml > $@
+	schema-learn $</*.xml > $@
 
 schema: $(DTDS)