[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit 956acdb6e1855e4ce6271b486d22a4ee254b0d13
Author: John Goerzen <jgoerzen at complete.org>
Date:   Thu Dec 7 03:01:13 2006 +0100

    Cleaned up Makefile

diff --git a/Makefile b/Makefile
index c6df32b..d977cfb 100644
--- a/Makefile
+++ b/Makefile
@@ -15,17 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SOURCES := $(wildcard MissingH/*.hs) \
-	$(wildcard MissingH/*/*.hs) \
-	$(wildcard MissingH/*/*/*.hs) 
-LHSSOURCES := $(wildcard MissingH/*/*.lhs) \
-	$(wildcard MissingH/*/*/*.lhs)
-TESTSOURCES := $(shell find testsrc -name "*.hs")
-O1 := $(SOURCES:.hs=.o) $(LHSSOURCES)
-OBJS := $(O1:.lhs=.o)
-LHSCONVSOURCES := $(patsubst %.lhs,doctmp/%.hs,$(LHSSOURCES))
-HUGSCONVSOURCES := $(patsubst %.hs,dist/build/%.hs,$(SOURCES))
-UNLIT ?= $(shell ghc --print-libdir)/unlit
+PROJECT := MissingH
 GHCPARMS := -fallow-overlapping-instances -fallow-undecidable-instances -fglasgow-exts -cpp
 
 .PHONY: all hugsbuild
@@ -37,7 +27,7 @@ hugsbuild: setup
 	./setup configure --hugs
 	./setup build
 
-setup: Setup.hs MissingH.cabal
+setup: Setup.hs $(PROJECT).cabal
 	ghc -package Cabal Setup.hs -o setup
 
 doctmp/%.hs: %.lhs doctmp
@@ -52,9 +42,9 @@ doc: $(LHSCONVSOURCES) setup
 	-rm -rf html
 	./setup configure
 	./setup haddock
-#	haddock $(HADDOCKARGS) --package=MissingH \
-#	   --dump-interface=html/MissingH.haddock \
-#	   -t 'MissingH API Manual' -h -o html $(HUGSCONVSOURCES) $(LHSCONVSOURCES)
+#	haddock $(HADDOCKARGS) --package=$(PROJECT) \
+#	   --dump-interface=html/$(PROJECT).haddock \
+#	   -t '$(PROJECT) API Manual' -h -o html $(HUGSCONVSOURCES) $(LHSCONVSOURCES)
 	mv dist/doc/html .
 
 .PHONY: hugsbuild

-- 
haskell-testpack