Skip to content

Commit 8193b4a

Browse files
committed
Start using cabal instead of Makefile
1 parent a1b6d02 commit 8193b4a

File tree

4 files changed

+23
-57
lines changed

4 files changed

+23
-57
lines changed

Makefile

+10-11
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ HTML = Html
99
HTML_LIBS_DIR = Html/htmllibs
1010
HTML_FONTS_DIR = Html/fonts
1111

12+
GHCOPTS := -odir .objs -hidir .objs -Wall -fwarn-tabs -fno-warn-missing-signatures -threaded
13+
14+
CABAL_USER := ~/.cabal/bin/cabal
1215

1316
# Required html Librarys
1417
URLS := http://code.jquery.com/jquery-latest.min.js
@@ -26,26 +29,22 @@ URLS_FONTS += https://netdna.bootstrapcdn.com/bootstrap/3.0.0/fonts/glyphicons-h
2629
GIT-LOGO += https://github-media-downloads.s3.amazonaws.com/Octocats.zip
2730
#
2831

29-
32+
reqdeps:
33+
3034
install: nglessconf
31-
cd NGLess && $(MAKE)
35+
cabal configure
36+
cabal install
3237

3338
nglessconf: bwaconf confhtmllibs
3439

35-
3640
ngless:
37-
cd NGLess && $(MAKE) ngless
41+
cabal install
3842

3943
nglesstest:
40-
cd NGLess && $(MAKE) nglesstest
41-
42-
tests:
43-
cd NGLess && $(MAKE) tests
44+
cabal install
4445

4546
clean:
46-
rm -rf $(BWA) $(HTML_LIBS_DIR) $(HTML_FONTS_DIR) $(64-MAC-PATH)*
47-
cd NGLess && $(MAKE) clean
48-
47+
rm -rf $(BWA) $(HTML_LIBS_DIR) $(HTML_FONTS_DIR) $(64-MAC-PATH)* dist .objs
4948

5049
##### auxiliary functions to setup required files
5150

NGLess/NGLess.cabal NGLess.cabal

+13-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,20 @@ build-type: Simple
1515
-- extra-source-files:
1616
cabal-version: >=1.18.0.3
1717

18-
library
19-
-- main-is: Main.hs
18+
executable ngless
19+
main-is: Main.hs
20+
ghc-options: -odir .objs -hidir .objs -Wall -fwarn-tabs -fno-warn-missing-signatures -threaded -O2
2021
-- other-modules:
2122
other-extensions: BangPatterns, OverloadedStrings, DeriveDataTypeable, TemplateHaskell, TupleSections
2223
build-depends: base >=4.6 && <4.7, bytestring >=0.10 && <0.11, vector >=0.10 && <0.11, filepath >=1.3 && <1.4, directory >=1.2 && <1.3, cmdargs >=0.10 && <0.11, mtl >=2.1 && <2.2, containers >=0.5 && <0.6, text >=0.11 && <0.12, process >=1.1 && <1.2, aeson >=0.7 && <0.8, old-time >=1.1 && <1.2, unix >=2.7 && <2.8, parsec >=3.1 && <3.2, zlib >=0.5 && <0.6, test-framework-th >=0.2 && <0.3, HUnit >=1.2 && <1.3, test-framework-hunit >=0.3 && <0.4, test-framework-quickcheck2 >=0.3 && <0.4, hashable >=1.2 && <1.3
23-
-- hs-source-dirs:
24+
hs-source-dirs: NGLess/
2425
default-language: Haskell2010
26+
27+
executable nglesstest
28+
main-is: Tests.hs
29+
ghc-options: -odir .objs -hidir .objs -Wall -fwarn-tabs -fno-warn-missing-signatures -threaded -O2
30+
-- other-modules:
31+
other-extensions: BangPatterns, OverloadedStrings, DeriveDataTypeable, TemplateHaskell, TupleSections
32+
build-depends: base >=4.6 && <4.7, bytestring >=0.10 && <0.11, vector >=0.10 && <0.11, filepath >=1.3 && <1.4, directory >=1.2 && <1.3, cmdargs >=0.10 && <0.11, mtl >=2.1 && <2.2, containers >=0.5 && <0.6, text >=0.11 && <0.12, process >=1.1 && <1.2, aeson >=0.7 && <0.8, old-time >=1.1 && <1.2, unix >=2.7 && <2.8, parsec >=3.1 && <3.2, zlib >=0.5 && <0.6, test-framework-th >=0.2 && <0.3, HUnit >=1.2 && <1.3, test-framework-hunit >=0.3 && <0.4, test-framework-quickcheck2 >=0.3 && <0.4, hashable >=1.2 && <1.3
33+
hs-source-dirs: NGLess/
34+
default-language: Haskell2010

NGLess/Makefile

-43
This file was deleted.

NGLess/Setup.hs Setup.hs

File renamed without changes.

0 commit comments

Comments
 (0)