cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Makefile is no longer used when running propellor, so build target is only used for building packages, or manual build

This commit is contained in:
Joey Hess 2015-02-28 14:25:58 -04:00
parent cc00056240
commit c4a7adfb29
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Makefile
View File

@ -5,9 +5,11 @@ CABAL?=cabal
run: build run: build
./propellor ./propellor
dev: build tags build: tags propellor.1 dist/setup-config
$(CABAL) build
ln -sf dist/build/propellor-config/propellor-config propellor
install: propellor.1 install:
install -d $(DESTDIR)/usr/bin $(DESTDIR)/usr/src/propellor install -d $(DESTDIR)/usr/bin $(DESTDIR)/usr/src/propellor
install -s dist/build/propellor/propellor $(DESTDIR)/usr/bin/propellor install -s dist/build/propellor/propellor $(DESTDIR)/usr/bin/propellor
mkdir -p dist/gittmp mkdir -p dist/gittmp
@ -22,9 +24,6 @@ install: propellor.1
&& git show-ref master --hash > $(DESTDIR)/usr/src/propellor/head && git show-ref master --hash > $(DESTDIR)/usr/src/propellor/head
rm -rf dist/gittmp rm -rf dist/gittmp
propellor.1: doc/usage.mdwn doc/mdwn2man
doc/mdwn2man propellor 1 < doc/usage.mdwn > propellor.1
clean: clean:
rm -rf dist Setup tags propellor propellor.1 privdata/local rm -rf dist Setup tags propellor propellor.1 privdata/local
find -name \*.o -exec rm {} \; find -name \*.o -exec rm {} \;
@ -34,7 +33,14 @@ clean:
# duplicate tags with Propellor.Property. removed from the start, as we # duplicate tags with Propellor.Property. removed from the start, as we
# often import qualified by just the module base name. # often import qualified by just the module base name.
tags: tags:
find . | grep -v /.git/ | grep -v /tmp/ | grep -v /dist/ | grep -v /doc/ | egrep '\.hs$$' | xargs hothasktags | perl -ne 'print; s/Propellor\.Property\.//; print' | sort > tags 2>/dev/null find . | grep -v /.git/ | grep -v /tmp/ | grep -v /dist/ | grep -v /doc/ | egrep '\.hs$$' | xargs hothasktags | perl -ne 'print; s/Propellor\.Property\.//; print' | sort > tags 2>/dev/null || true
dist/setup-config: propellor.cabal
@if [ "$(CABAL)" = ./Setup ]; then ghc --make Setup; fi
@$(CABAL) configure
propellor.1: doc/usage.mdwn doc/mdwn2man
doc/mdwn2man propellor 1 < doc/usage.mdwn > propellor.1
# Upload to hackage. # Upload to hackage.
hackage: hackage:
@ -42,15 +48,3 @@ hackage:
@cabal upload dist/*.tar.gz @cabal upload dist/*.tar.gz
.PHONY: tags .PHONY: tags
# The rules below are only used when bootstrapping new propellor
# installations and building packages; propellor contains equivilant
# haskell code that it uses to re-build itself.
build: dist/setup-config
@if ! $(CABAL) build; then $(CABAL) configure; $(CABAL) build; fi
@ln -sf dist/build/propellor-config/propellor-config propellor
dist/setup-config: propellor.cabal
@if [ "$(CABAL)" = ./Setup ]; then ghc --make Setup; fi
@$(CABAL) configure