makefile updates
This commit is contained in:
		
							parent
							
								
									403ddcadc2
								
							
						
					
					
						commit
						93128d71b4
					
				
							
								
								
									
										9
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										9
									
								
								Makefile
									
									
									
									
									
								
							| @ -30,6 +30,7 @@ GHCPKG=ghc-pkg | |||||||
| HADDOCK=haddock | HADDOCK=haddock | ||||||
| CABAL=cabal | CABAL=cabal | ||||||
| CABALINSTALL=cabal install -w $(GHC) | CABALINSTALL=cabal install -w $(GHC) | ||||||
|  | SHELLTEST=shelltest | ||||||
| # used for make auto, http://joyful.com/repos/searchpath
 | # used for make auto, http://joyful.com/repos/searchpath
 | ||||||
| SP=sp | SP=sp | ||||||
| 
 | 
 | ||||||
| @ -44,7 +45,7 @@ INCLUDEPATHS=\ | |||||||
| 	-ihledger-web \
 | 	-ihledger-web \
 | ||||||
| 	-ihledger-web/app | 	-ihledger-web/app | ||||||
| 
 | 
 | ||||||
| MAIN=hledger/hledger-cli.hs | MAIN=hledger/app/hledger-cli.hs | ||||||
| 
 | 
 | ||||||
| # all source files in the project (plus a few strays like Setup.hs & hlint.hs)
 | # all source files in the project (plus a few strays like Setup.hs & hlint.hs)
 | ||||||
| SOURCEFILES:= \
 | SOURCEFILES:= \
 | ||||||
| @ -308,9 +309,9 @@ linuxbinaries: 	linuxbinary-hledger \ | |||||||
| 	@echo 'Please check the binaries look portable, then make compressbinaries:' | 	@echo 'Please check the binaries look portable, then make compressbinaries:' | ||||||
| 	-file bin/*`arch` | 	-file bin/*`arch` | ||||||
| 
 | 
 | ||||||
| # work around for inconsistently-named (why ?) hledger/hledger-cli.hs
 | # work around for inconsistently-named (why ?) hledger/app/hledger-cli.hs
 | ||||||
| linuxbinary-hledger: | linuxbinary-hledger: | ||||||
| 	$(GHC) hledger/hledger-cli.hs -o bin/$*$(RELEASEBINARYSUFFIX) $(LINUXRELEASEBUILDFLAGS) | 	$(GHC) hledger/app/hledger-cli.hs -o bin/$*$(RELEASEBINARYSUFFIX) $(LINUXRELEASEBUILDFLAGS) | ||||||
| 
 | 
 | ||||||
| linuxbinary-%: | linuxbinary-%: | ||||||
| 	$(GHC) $*/$*.hs -o bin/$*$(RELEASEBINARYSUFFIX) $(LINUXRELEASEBUILDFLAGS) | 	$(GHC) $*/$*.hs -o bin/$*$(RELEASEBINARYSUFFIX) $(LINUXRELEASEBUILDFLAGS) | ||||||
| @ -428,8 +429,6 @@ packdeps: | |||||||
| ######################################################################
 | ######################################################################
 | ||||||
| # TESTING
 | # TESTING
 | ||||||
| 
 | 
 | ||||||
| SHELLTEST=shelltest |  | ||||||
| 
 |  | ||||||
| test: codetest | test: codetest | ||||||
| 
 | 
 | ||||||
| # quick code tests - run all the time
 | # quick code tests - run all the time
 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user