minor, place sdp.d in lib/ rather than lib/sdp

2 files changed, 31 insertions, 31 deletions

diff --git a/maker.org b/maker.org
index f7f494e..a46006a 100644
--- a/maker.org
+++ b/maker.org
@@ -16,7 +16,7 @@
 ** settings [+2]                                                   :settings:
 *** alternative D compilers [+1]                                   :compiler:
 **** dmd                                                                 :dmd:
-#+name: makefile
+#+name: makefile_maker
 #+BEGIN_SRC makefile                                          :exports none
 DMD=dmd
 DMD_FLAGS=-de -w
@@ -25,7 +25,7 @@ DMD_FLAG_BINOF=-of
 
 #+end_src
 **** ldc2                                                                :ldc:
-#+name: makefile
+#+name: makefile_maker
 #+BEGIN_SRC makefile                                          :exports none
 LDC=ldc2
 LDC_FLAGS=-w
@@ -34,7 +34,7 @@ LDC_FLAG_BINOF=-of=
 
 #+end_src
 **** gdc                                                                 :gdc:
-#+name: makefile
+#+name: makefile_maker
 #+BEGIN_SRC makefile                                          :exports none
 GDC=gdc
 #GDC=gdc-5
@@ -49,7 +49,7 @@ GDC_FLAG_BINOF=-o
 **** SET compiler: "SET_D_COMPILER=":                         :compiler:select:
 Set D_COMPILER one of DMD LDC or GDC e.g.:
   SET_D_COMPILER=DMD
-#+name: makefile
+#+name: makefile_maker
 #+BEGIN_SRC makefile                                          :exports none
 # set D_COMPILER one of DMD LDC or GDC:
 SET_D_COMPILER=LDC
@@ -58,14 +58,14 @@ SET_D_COMPILER=LDC
 **** SET debug flags: "SET_DC_FLAGS_DEBUG_EXTRA=-debug=": :compiler:flags:debug:
 Set debug flags using DMD standard flag -debug= e.g.:
   SET_DC_FLAGS_DEBUG_EXTRA=-debug=headings -debug=bookindex
-#+name: makefile
+#+name: makefile_maker
 #+BEGIN_SRC makefile                                          :exports none
 SET_DC_FLAGS_DEBUG_EXTRA=-debug=headings -debug=bookindex
 
 #+end_src
 *** D compiler settings [+1]                              :settings:compiler:
 **** compiler settings
-#+name: makefile
+#+name: makefile_maker
 #+BEGIN_SRC makefile                                          :exports none
 DC=$($(SET_D_COMPILER))
 DC_FLAGS=$($(shell echo $(SET_D_COMPILER)_FLAGS))
@@ -77,7 +77,7 @@ DC_FLAGS_DEBUG_SET=\
 
 #+end_src
 **** compiler conditional settings (depending on selected D compiler)
-#+name: makefile
+#+name: makefile_maker
 #+BEGIN_SRC makefile                                          :exports none
 ifeq ($(DC), $(DMD))
 	DC_FLAGS_DEBUG :=$(shell echo $(DC_FLAGS_DEBUG_SET))
@@ -91,17 +91,17 @@ endif
 
 #+end_src
 *** Project Details                                             :project:sdp:
-#+name: makefile
+#+name: makefile_maker
 #+BEGIN_SRC makefile                                           :exports none
 PRG_NAME=sdp
 PRG_SRC=$(PRG_NAME).d
-PRG_SRCDIR=./lib/$(PRG_NAME)
+PRG_SRCDIR=./lib
 PRG_BIN=$(PRG_NAME)
 PRG_BINDIR=bin
 
 #+end_src
 *** Emacs Org settings                                  :settings:emacs:org:
-#+name: makefile
+#+name: makefile_maker
 #+BEGIN_SRC makefile                                           :exports none
 # ORG
 EMACSLISP=/usr/share/emacs/site-lisp
@@ -130,7 +130,7 @@ ORGDIR=$(shell echo `pwd`)
 
 *** build commands [+1]
 **** build rebuild
-#+name: makefile
+#+name: makefile_maker
 #+BEGIN_SRC makefile                                           :exports none
 all: build
 
@@ -142,7 +142,7 @@ build: $(PRG_SRCDIR)/$(PRG_SRC)
 rebuild: $(PRG_SRCDIR)/$(PRG_SRC) $(PRG_BINDIR)/$(PRG_BIN).o clean build
 #+end_src
 **** debug
-#+name: makefile
+#+name: makefile_maker
 #+BEGIN_SRC makefile                                           :exports none
 
 debug: $(PRG_SRCDIR)/$(PRG_SRC)
@@ -166,7 +166,7 @@ debug_gdc: $(PRG_SRCDIR)/$(PRG_SRC)
 	$(PRG_SRCDIR)/$(PRG_SRC)
 #+end_src
 **** release
-#+name: makefile
+#+name: makefile_maker
 #+BEGIN_SRC makefile                                           :exports none
 
 release: distclean_and_init tangle $(PRG_SRCDIR)/$(PRG_SRC)
@@ -176,7 +176,7 @@ release: distclean_and_init tangle $(PRG_SRCDIR)/$(PRG_SRC)
 
 #+end_src
 *** init clean distclean etc.
-#+name: makefile
+#+name: makefile_maker
 #+BEGIN_SRC makefile                                             :exports none
 init:
 	mkdir -p $(PRG_SRCDIR); \
@@ -197,7 +197,7 @@ distclean_and_init: init $(PRG_BINDIR) expunge
 
 #+end_src
 *** Org Babel Tangle batch process command
-#+name: makefile
+#+name: makefile_maker
 #+BEGIN_SRC makefile                                             :exports none
 tangle:
 	for f in $(ORGFILELIST); do \
@@ -220,14 +220,14 @@ tangle:
 
 #+end_src
 *** Git snapshot
-#+name: makefile
+#+name: makefile_maker
 #+BEGIN_SRC makefile                                             :exports none
 gitsnapshot: distclean_and_init tangle
 	git commit -a
 
 #+end_src
 ** phony
-#+name: makefile
+#+name: makefile_maker
 #+BEGIN_SRC makefile                                               :exports none
 .PHONY : all build rebuild debug release \
 	clean distclean init \
@@ -266,5 +266,5 @@ emacs --batch -Q -q \
 ** makefile:                                                   :makefile:
 #+name: tangle_ao_rgx
 #+BEGIN_SRC makefile  :tangle makefile     :exports none   :noweb yes
-<<makefile>>
+<<makefile_maker>>
 #+end_src
diff --git a/org/sdp.org b/org/sdp.org
index a9881ee..da8dc43 100644
--- a/org/sdp.org
+++ b/org/sdp.org
@@ -35,17 +35,17 @@ import
   std.container,
   std.traits,
   // std.variant,
-  lib.sdp.ao_output_debugs,        // ao_output_debugs.d       ao_output_debugs.org
-  lib.sdp.ao_defaults,             // ao_defaults.d            ao_defaults.arg
-  lib.sdp.ao_rgx,                  // ao_rgx.d                 ao_rgx.org
-  lib.sdp.ao_interface,            // ao_interface.d           ao_interface.arg
-  lib.sdp.ao_emitter,              // ao_emitter.d             ao_emitter.org
-  lib.sdp.ao_scan_inserts,         // ao_scan_inserts.d        ao_scan_inserts.org
-  lib.sdp.ao_markup_source_raw,    // ao_markup_source_raw.d   ao_markup_source_raw.org
-  lib.sdp.ao_abstract_doc_source,  // ao_abstract_doc_source.d ao_abstract_doc_source.org
-  lib.sdp.ao_assertions,           // ao_assertions.d          ao_assertions.org
-  lib.sdp.ao_object_setter,        // ao_object_setter.d       ao_object_setter.org
-  lib.sdp.ao_utils;                // ao_utils.d               ao_utils.org
+  lib.sdp.ao_output_debugs,        // sdp/ao_output_debugs.d       ao_output_debugs.org
+  lib.sdp.ao_defaults,             // sdp/ao_defaults.d            ao_defaults.arg
+  lib.sdp.ao_rgx,                  // sdp/ao_rgx.d                 ao_rgx.org
+  lib.sdp.ao_interface,            // sdp/ao_interface.d           ao_interface.arg
+  lib.sdp.ao_emitter,              // sdp/ao_emitter.d             ao_emitter.org
+  lib.sdp.ao_scan_inserts,         // sdp/ao_scan_inserts.d        ao_scan_inserts.org
+  lib.sdp.ao_markup_source_raw,    // sdp/ao_markup_source_raw.d   ao_markup_source_raw.org
+  lib.sdp.ao_abstract_doc_source,  // sdp/ao_abstract_doc_source.d ao_abstract_doc_source.org
+  lib.sdp.ao_assertions,           // sdp/ao_assertions.d          ao_assertions.org
+  lib.sdp.ao_object_setter,        // sdp/ao_object_setter.d       ao_object_setter.org
+  lib.sdp.ao_utils;                // sdp/ao_utils.d               ao_utils.org
   // std.conv;
 import std.conv : to;
 #+end_src
@@ -94,7 +94,7 @@ scope(success) {
 scope(failure) {
   debug(checkdoc) {
     writeln(
-      scr_txt_color["fucshia"],
+      scr_txt_color["fuchsia"],
       "~ run failure ~",
       scr_txt_color["off"],
     );
@@ -234,7 +234,7 @@ break;
 * tangles                                                            :tangle:
 ** code structure                                                    :sdp.d:
 #+name: tangle_sdp
-#+BEGIN_SRC d  :tangle ../lib/sdp/sdp.d  :exports none :noweb yes
+#+BEGIN_SRC d  :tangle ../lib/sdp.d  :exports none :noweb yes
 #!/usr/bin/env rdmd
 /*
   sdp