Update package names in makefile
authorBen Lippmeier <benl@ouroborus.net>
Fri, 25 Nov 2011 04:44:59 +0000 (15:44 +1100)
committerBen Lippmeier <benl@ouroborus.net>
Tue, 29 Nov 2011 05:32:39 +0000 (16:32 +1100)
make/targets/packages.mk

index 0c07d35..f2f074f 100644 (file)
@@ -1,5 +1,4 @@
 
-.PHONY : packages
 
 dph_packages_backend = \
        dph-base \
@@ -8,10 +7,10 @@ dph_packages_backend = \
        dph-prim-par
        
 dph_packages_frontend = \
-       dph-seq \
-       dph-par \
-       dph-lifted-vseg-seq \
-       dph-lifted-vseg-par
+       dph-lifted-base \
+       dph-lifted-boxed \
+       dph-lifted-copy \
+       dph-lifted-vseg
 
 dph_packages = \
        $(dph_packages_backend) \
@@ -29,7 +28,7 @@ packages   : $(dph_packages_dbs)
 # Unregister all the DPH packages
 .PHONY    : unregsiter
 unregister :
-       @for p in $(dph_packages_backend); do \
+       @for p in $(dph_packages); do \
                $(GHC_PKG) unregister $$p --force; \
        done
 
@@ -44,47 +43,3 @@ unregister :
        
        @echo
 
-
-# -- Front end package stubs --------------------------------------------------
-# Create a front-end build package stub
-#   Both front-end source packages can be compiled against both backend packages,
-#   for a total of four possible ways. We build these by copying the common
-#   cabal file out to a new directory, and setting the source dir field in 
-#   that cabal file to point to the location of the original sources.
-define dph_create_frontend_build
-dph-lifted-$1-$2 :
-       @echo "* Creating frontend package $$@"
-       @mkdir -p dph-lifted-$1-$2.tmp
-       @cp dph-lifted-$1/Setup.hs dph-lifted-$1-$2.tmp/Setup.hs
-       @cp dph-lifted-$1/LICENSE  dph-lifted-$1-$2.tmp/LICENSE
-       
-       @sed "s/DPHWAY/$2/g" dph-lifted-$1/dph-lifted-$1.cabal \
-               > dph-lifted-$1-$2.tmp/dph-lifted-$1-$2.cabal
-
-       @mv dph-lifted-$1-$2.tmp dph-lifted-$1-$2
-endef
-
-$(eval $(call dph_create_frontend_build,vseg,seq))
-$(eval $(call dph_create_frontend_build,vseg,par))
-
-
-define dph_create_frontend_common
-dph-$1 : dph-common/Setup.hs dph-common/LICENSE dph-common/dph-common.cabal
-       @echo "* Creating frontend package $$@"
-       @rm    -Rf dph-$1 dph-$1.tmp
-       @mkdir -p  dph-$1.tmp
-       @cp dph-common/Setup.hs dph-$1.tmp/Setup.hs
-       @cp dph-common/LICENSE  dph-$1.tmp/LICENSE
-       
-       @sed "s/DPHWAY/$1/g" dph-common/dph-common.cabal \
-               > dph-$1.tmp/dph-$1.cabal
-
-       @mv dph-$1.tmp dph-$1
-endef
-
-$(eval $(call dph_create_frontend_common,seq))
-$(eval $(call dph_create_frontend_common,par))
-
-
-.PHONY : front
-front  : $(dph_packages_frontend)