org file headers updated

1 files changed, 22 insertions, 21 deletions

diff --git a/maker.org b/maker.org
index 144e04a..9c29b91 100644
--- a/maker.org
+++ b/maker.org
@@ -6,6 +6,7 @@
 #+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t
 #+OPTIONS: TeX:t LaTeX:t skip:nil d:nil todo:t pri:nil tags:not-in-toc
 #+OPTIONS: author:nil email:nil creator:nil timestamp:nil
+#+PROPERTY: header-args :padline no :exports none :noweb yes
 #+EXPORT_SELECT_TAGS: export
 #+EXPORT_EXCLUDE_TAGS: noexport
 #+FILETAGS: :sdp:rel:makefile:
@@ -17,25 +18,25 @@
 *** alternative D compilers [+1]                                   :compiler:
 **** dmd                                                                 :dmd:
 
-#+BEGIN_SRC makefile   :padline no                              :tangle makefile
+#+BEGIN_SRC makefile :tangle makefile
 DMD=dmd
-DMD_FLAGS=-de -w
+DMD_FLAGS=-de -w -Jlib
 DMD_FLAGS_RELEASE=-release
 DMD_FLAG_BINOF=-of
 #+END_SRC
 
 **** ldc2                                                                :ldc:
 
-#+BEGIN_SRC makefile                                            :tangle makefile
+#+BEGIN_SRC makefile :tangle makefile
 LDC=ldc2
-LDC_FLAGS=-w
+LDC_FLAGS=-w -J=lib
 LDC_FLAGS_RELEASE=-release
 LDC_FLAG_BINOF=-of=
 #+END_SRC
 
 **** gdc                                                                 :gdc:
 
-#+BEGIN_SRC makefile                                            :tangle makefile
+#+BEGIN_SRC makefile :tangle makefile
 GDC=gdc
 #GDC=gdc-5
 GDC_FLAGS=
@@ -43,16 +44,16 @@ GDC_FLAGS_RELEASE=-frelease
 GDC_FLAG_BINOF=-o
 #+END_SRC
 
-*** TODO set/select: ~D compiler~ & ~debug flags~ [+1] [2/2]         :select:
+*** TODO set/select: ~D compiler~ & ~debug flags~ [+1] [2/2]   :select:
 - [X] Set D_COMPILER (one of DMD LDC or GDC)
 - [X] Set debug flags (using DMD standard flag -debug=)
 
 **** SET compiler: "SET_D_COMPILER=":                         :compiler:select:
 [[http://wiki.dlang.org/Compilers][D Compilers wiki]]
 [[http://dlang.org/download.html][D Compilers download]]
-Set D_COMPILER one of DMD LDC or GDC e.g.: SET_D_COMPILER=DMD
+Set D_COMPILER one of DMD, LDC or GDC e.g.: SET_D_COMPILER=DMD
 
-#+BEGIN_SRC makefile                                            :tangle makefile
+#+BEGIN_SRC makefile :tangle makefile
 # SET_D_COMPILER=(one of: DMD LDC or GDC):
 SET_D_COMPILER=LDC
 #+END_SRC
@@ -61,14 +62,14 @@ SET_D_COMPILER=LDC
 Set debug flags using DMD standard flag -debug= e.g.:
   SET_DC_FLAGS_DEBUG_EXTRA=-debug=headings -debug=bookindex
 
-#+BEGIN_SRC makefile                                            :tangle makefile
+#+BEGIN_SRC makefile :tangle makefile
 SET_DC_FLAGS_DEBUG_EXTRA=-debug=headings -debug=footnotes -debug=endnotes
 #+END_SRC
 
 *** D compiler settings [+1]                              :settings:compiler:
 **** compiler settings
 
-#+BEGIN_SRC makefile                                            :tangle makefile
+#+BEGIN_SRC makefile :tangle makefile
 DC=$($(SET_D_COMPILER))
 DC_FLAGS=$($(shell echo $(SET_D_COMPILER)_FLAGS))
 DC_FLAGS_RELEASE=$($(shell echo $(SET_D_COMPILER)_FLAGS_RELEASE))
@@ -80,7 +81,7 @@ DC_FLAGS_DEBUG_SET=\
 
 **** compiler conditional settings (depending on selected D compiler)
 
-#+BEGIN_SRC makefile                                            :tangle makefile
+#+BEGIN_SRC makefile :tangle makefile
 ifeq ($(DC), $(DMD))
 	DC_FLAGS_DEBUG :=$(shell echo $(DC_FLAGS_DEBUG_SET))
 endif
@@ -94,7 +95,7 @@ endif
 
 *** Project Details                                             :project:sdp:
 
-#+BEGIN_SRC makefile                                            :tangle makefile
+#+BEGIN_SRC makefile :tangle makefile
 PRG_NAME=sdp
 PRG_SRC=$(PRG_NAME).d
 PRG_SRCDIR=./lib
@@ -104,7 +105,7 @@ PRG_BINDIR=bin
 
 *** Emacs Org settings                            :settings:emacs:org:tangle:
 
-#+BEGIN_SRC makefile                                            :tangle makefile
+#+BEGIN_SRC makefile :tangle makefile
 # ORG
 EMACSLISP=/usr/share/emacs/site-lisp
 EMACSLISP_ORG=~/.emacs.d/elpa/org-20151005
@@ -133,7 +134,7 @@ ORGDIR=$(shell echo `pwd`)
 *** build commands [+1]                                       :build:compile:
 **** build rebuild
 
-#+BEGIN_SRC makefile                                            :tangle makefile
+#+BEGIN_SRC makefile :tangle makefile
 all: build
 
 build: $(PRG_SRCDIR)/$(PRG_SRC)
@@ -146,7 +147,7 @@ rebuild: $(PRG_SRCDIR)/$(PRG_SRC) $(PRG_BINDIR)/$(PRG_BIN).o clean build
 
 **** debug
 
-#+BEGIN_SRC makefile                                            :tangle makefile
+#+BEGIN_SRC makefile :tangle makefile
 debug: $(PRG_SRCDIR)/$(PRG_SRC)
 	$(DC) $(DC_FLAGS) $(DC_FLAGS_DEBUG) \
 	$(DC_FLAG_BINOF)$(PRG_BINDIR)/$(PRG_BIN) \
@@ -170,7 +171,7 @@ debug_gdc: $(PRG_SRCDIR)/$(PRG_SRC)
 
 **** release
 
-#+BEGIN_SRC makefile                                            :tangle makefile
+#+BEGIN_SRC makefile :tangle makefile
 release: distclean_and_init tangle $(PRG_SRCDIR)/$(PRG_SRC)
 	$(DC) $(DC_FLAGS) $(DC_FLAGS_RELEASE) \
 	$(DC_FLAG_BINOF)$(PRG_BINDIR)/$(PRG_BIN) \
@@ -179,7 +180,7 @@ release: distclean_and_init tangle $(PRG_SRCDIR)/$(PRG_SRC)
 
 *** init clean distclean etc.                                         :clean:
 
-#+BEGIN_SRC makefile                                            :tangle makefile
+#+BEGIN_SRC makefile :tangle makefile
 init:
 	mkdir -p $(PRG_SRCDIR); \
 	mkdir -p $(PRG_BINDIR);
@@ -200,7 +201,7 @@ distclean_and_init: init $(PRG_BINDIR) expunge
 
 *** Org Babel Tangle batch process command                           :tangle:
 
-#+BEGIN_SRC makefile                                            :tangle makefile
+#+BEGIN_SRC makefile :tangle makefile
 tangle:
 	for f in $(ORGFILELIST); do \
 		ORGFILES="$$ORGFILES \"$$f\""; \
@@ -223,14 +224,14 @@ tangle:
 
 *** Git snapshot
 
-#+BEGIN_SRC makefile                                            :tangle makefile
+#+BEGIN_SRC makefile :tangle makefile
 gitsnapshot: distclean_and_init tangle
 	git commit -a
 #+END_SRC
 
 ** phony
 
-#+BEGIN_SRC makefile                                            :tangle makefile
+#+BEGIN_SRC makefile :tangle makefile
 .PHONY : all build rebuild debug release \
 	clean distclean init \
 	tangle
@@ -243,7 +244,7 @@ babel tangle) org files in ./org/ to create .d source files in ./lib/sdp/
 (similar functionality is contained within the "makefile" created by this
 "maker.org" file make tangle)
 
-#+BEGIN_SRC sh :tangle tangle :padline no :tangle-mode (identity #o755) :shebang #!/bin/sh
+#+BEGIN_SRC sh :tangle tangle :tangle-mode (identity #o755) :shebang #!/bin/sh
 # -*- mode: shell-script -*-
 # tangle files with org-mode
 DIR=`pwd`