netlist: Fix various issues around include directories.

* removed include directory src/lib/netlist from various genie files to
avoid potential issues.
* Code using netlist should use #include "netlist/*".
* Updated includes.
* Fixed standalone makefile depend target to properly deal with relative
paths.

scripts/src/netlist.lua

@@ -32,7 +32,7 @@ project "netlist"
 	}
 
 	includedirs {
-		MAME_DIR .. "src/lib",
+	--	MAME_DIR .. "src/lib",
 		MAME_DIR .. "src/lib/netlist",
 	}
 

scripts/target/mame/arcade.lua

@@ -961,7 +961,6 @@ function createMAMEProjects(_target, _subtarget, _name)
 		MAME_DIR .. "src/mame",
 		MAME_DIR .. "src/lib",
 		MAME_DIR .. "src/lib/util",
-		MAME_DIR .. "src/lib/netlist",
 		MAME_DIR .. "3rdparty",
 		GEN_DIR  .. "mame/layout",
 	}

scripts/target/mame/dummy.lua

@@ -27,7 +27,6 @@ function createProjects_mame_dummy(_target, _subtarget)
 		MAME_DIR .. "src/mame",
 		MAME_DIR .. "src/lib",
 		MAME_DIR .. "src/lib/util",
-		MAME_DIR .. "src/lib/netlist",
 		MAME_DIR .. "3rdparty",
 		GEN_DIR  .. "mame/layout",
 	}

scripts/target/mame/mess.lua

@@ -1398,7 +1398,6 @@ function createMESSProjects(_target, _subtarget, _name)
 		MAME_DIR .. "src/mame",
 		MAME_DIR .. "src/lib",
 		MAME_DIR .. "src/lib/util",
-		MAME_DIR .. "src/lib/netlist",
 		MAME_DIR .. "3rdparty",
 		GEN_DIR  .. "mame/layout",
 	}

scripts/target/mame/nl.lua

@@ -133,7 +133,6 @@ function createProjects_mame_nl(_target, _subtarget)
 		MAME_DIR .. "src/osd",
 		MAME_DIR .. "src/emu",
 		MAME_DIR .. "src/devices",
-		MAME_DIR .. "src/lib/netlist",
 		MAME_DIR .. "src/mame",
 		MAME_DIR .. "src/lib",
 		MAME_DIR .. "src/lib/util",

src/devices/machine/netlist.cpp

@@ -16,7 +16,6 @@
 #include "netlist/nl_factory.h"
 #include "netlist/nl_parser.h"
 #include "netlist/nl_interface.h"
-//#include "netlist/devices/nlid_system.h"
 
 #include "netlist/plib/palloc.h"
 #include "netlist/plib/pmempool.h"

src/lib/netlist/analog/nld_bjt.cpp

@@ -1,8 +1,8 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 
-#include "netlist/solver/nld_solver.h"
-#include "netlist/nl_base.h"
+#include "solver/nld_solver.h"
+#include "nl_base.h"
 #include "nlid_twoterm.h"
 
 // FIXME: Remove QBJT_switch - no more use

src/lib/netlist/analog/nld_bjt.h

@@ -8,7 +8,7 @@
 /// \file nld_bjt.h
 ///
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // -----------------------------------------------------------------------------
 // Macros

src/lib/netlist/analog/nld_fourterm.h

@@ -8,7 +8,7 @@
 /// \file nld_fourterm.h
 ///
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // ----------------------------------------------------------------------------------------
 // Macros

src/lib/netlist/analog/nld_generic_models.h

@@ -8,8 +8,8 @@
 /// \file nld_generic_models.h
 ///
 
-#include "netlist/nl_base.h"
-#include "netlist/nl_setup.h"
+#include "nl_base.h"
+#include "../nl_setup.h"
 
 //
 // Set to 0 to use a linearized diode model in the range exceeding

src/lib/netlist/analog/nld_mosfet.cpp

@@ -18,8 +18,8 @@
 // Stefan Jahn, Michael Margraf, Vincent Habchi and Raimund Jacob, "Qucs Technical Papers" (2007)
 //
 
-#include "netlist/solver/nld_solver.h"
-#include "netlist/nl_setup.h"
+#include "solver/nld_solver.h"
+#include "../nl_setup.h"
 #include "nlid_twoterm.h"
 
 #define BODY_CONNECTED_TO_SOURCE    (1)

src/lib/netlist/analog/nld_mosfet.h

@@ -4,7 +4,7 @@
 #ifndef NLD_MOSFET_H_
 #define NLD_MOSFET_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 ///
 /// \file nld_mosfet.h

src/lib/netlist/analog/nld_opamps.cpp

@@ -2,8 +2,8 @@
 // copyright-holders:Couriersud
 
 #include "nld_opamps.h"
-#include "netlist/nl_base.h"
-#include "netlist/nl_errstr.h"
+#include "nl_base.h"
+#include "nl_errstr.h"
 #include "nlid_fourterm.h"
 #include "nlid_twoterm.h"
 

src/lib/netlist/analog/nld_opamps.h

@@ -8,7 +8,7 @@
 /// \file nld_opamps.h
 ///
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // ----------------------------------------------------------------------------------------
 // Macros

src/lib/netlist/analog/nld_switches.cpp

@@ -2,9 +2,9 @@
 // copyright-holders:Couriersud
 
 #include "nlid_twoterm.h"
-#include "netlist/nl_base.h"
-#include "netlist/nl_factory.h"
-#include "netlist/solver/nld_solver.h"
+#include "nl_base.h"
+#include "nl_factory.h"
+#include "solver/nld_solver.h"
 
 // FIXME : convert to parameters
 

src/lib/netlist/analog/nld_switches.h

@@ -8,7 +8,7 @@
 /// \file nld_switches.h
 ///
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // ----------------------------------------------------------------------------------------
 // Macros

src/lib/netlist/analog/nld_twoterm.h

@@ -8,7 +8,7 @@
 /// \file nld_twoterm.h
 ///
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // -----------------------------------------------------------------------------
 // Macros

src/lib/netlist/analog/nlid_fourterm.cpp

@@ -1,8 +1,8 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 
-#include "netlist/solver/nld_solver.h"
-#include "netlist/nl_factory.h"
+#include "solver/nld_solver.h"
+#include "nl_factory.h"
 #include "nlid_fourterm.h"
 
 namespace netlist

src/lib/netlist/analog/nlid_fourterm.h

@@ -8,7 +8,7 @@
 /// \file nlid_fourterm.h
 ///
 
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 #include "plib/putil.h"
 
 namespace netlist {

src/lib/netlist/analog/nlid_twoterm.cpp

@@ -1,9 +1,9 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 
-#include "netlist/solver/nld_solver.h"
+#include "solver/nld_solver.h"
 
-#include "netlist/nl_factory.h"
+#include "nl_factory.h"
 #include "nlid_twoterm.h"
 
 namespace netlist

src/lib/netlist/analog/nlid_twoterm.h

@@ -34,10 +34,10 @@
 ///
 //
 
-#include "netlist/nl_base.h"
-#include "netlist/nl_setup.h"
-#include "netlist/plib/pfunction.h"
-#include "netlist/solver/nld_solver.h"
+#include "nl_base.h"
+#include "../nl_setup.h"
+#include "plib/pfunction.h"
+#include "solver/nld_solver.h"
 #include "nld_generic_models.h"
 
 // -----------------------------------------------------------------------------

src/lib/netlist/build/makefile

@@ -23,6 +23,8 @@
 .DEFAULT_GOAL := all
 
 SRC = ..
+#SRC = $(abspath ..)
+
 PSRC = $(SRC)/plib
 VSBUILD = $(SRC)/buildVS
 DOC = $(SRC)/documentation
@@ -91,7 +93,7 @@ TIDY_DB = $(OBJ)/compile_commands.json
 #LTO decreases performance :-(
 #LTO = -flto=4  -fuse-linker-plugin -Wodr
 
-CCOREFLAGS = -g -O3 -std=c++14 -I$(CURDIR)/.. -I$(CURDIR)/../..
+CCOREFLAGS = -g -O3 -std=c++14 -I$(SRC) 
 
 CFLAGS =  $(LTO) $(CCOREFLAGS) $(CEXTRAFLAGS)
 LDFLAGS = $(LTO) -g -O3 -std=c++14 $(LDEXTRAFLAGS)
@@ -130,10 +132,10 @@ OBJDIRS = $(OBJ) \
 			$(OBJ)/prg \
 			$(OBJ)/generated \
 
-DEVSOURCES = $(wildcard $(SRC)/devices/*.cpp)
+DEVSOURCES =  $(SRC)/solver/nld_solver.cpp
+DEVSOURCES += $(wildcard $(SRC)/devices/*.cpp)
 DEVSOURCES += $(wildcard $(SRC)/analog/*.cpp)
 DEVSOURCES += $(wildcard $(SRC)/macro/*.cpp)
-DEVSOURCES += $(SRC)/solver/nld_solver.cpp
 
 TESTSOURCES = $(wildcard $(SRC)/tests/*.cpp)
 
@@ -210,7 +212,7 @@ BUILD_DIRS = $(OBJDIRS) man html
 # all
 #-------------------------------------------------
 
-all: maketree generated $(DEPEND) $(TARGETS)
+all: maketree $(DEPEND) $(TARGETS)
 
 #-------------------------------------------------
 # clean
@@ -225,11 +227,11 @@ clean:
 
 nltool$(EXESUFFIX): $(OBJ)/prg/nltool.o $(OBJS)
 	@echo Linking $@...
-	$(LD) -o $@ $(LDFLAGS) $^ $(LIBS)
+	@$(LD) -o $@ $(LDFLAGS) $^ $(LIBS)
 
 nlwav$(EXESUFFIX): $(OBJ)/prg/nlwav.o $(OBJS)
 	@echo Linking $@...
-	$(LD) -o $@ $(LDFLAGS) $^ $(LIBS)
+	@$(LD) -o $@ $(LDFLAGS) $^ $(LIBS)
 
 #-------------------------------------------------
 # directories
@@ -314,21 +316,6 @@ doc:
 	./nltool$(EXESUFFIX) -c docheader > ../documentation/devsyn.dox.h
 	$(DOXYGEN) doxygen.conf
 
-#-------------------------------------------------
-# generated
-#-------------------------------------------------
-
-../generated/lib_entries.hxx: $(DEVSOURCES)
-	@echo creating $@
-	$(PYTHON) create_lib_entries.py $^ > $@
-
-../generated/nld_devinc.h: $(DEVSOURCES)
-	@echo creating $@
-	$(PYTHON) create_devinc.py $^ > $@
-
-.PHONY: generated
-generated: ../generated/lib_entries.hxx ../generated/nld_devinc.h
-
 #-------------------------------------------------
 # depends
 #-------------------------------------------------
@@ -336,11 +323,13 @@ generated: ../generated/lib_entries.hxx ../generated/nld_devinc.h
 .PHONY: depend
 depend: $(DEPEND)
 
-$(DEPEND): $(OBJ) | $(ALLSOURCES)
+$(DEPEND): $(ALLSOURCES) | $(OBJ)
 	@echo creating $(DEPEND)
 	@$(RM) -f $(DEPEND)
 	@for i in $(ALLSOURCES); do \
-		$(DEPENDCC) $(CCOREFLAGS) -MM $$i -MT `echo $$i | sed -e 's+$(SRC)+$(OBJ)+' -e 's+.cpp+.o+' ` >> $(DEPEND); \
+		$(DEPENDCC) $(CCOREFLAGS) -MM $$i -MT `echo $$i \
+		| sed -e 's+$(SRC)+$(OBJ)+' -e 's+.cpp+.o+' ` \
+		| sed -e 's_\.\./[a-z]*/\.\./_../_g' >> $(DEPEND); \
 	done
 
 # Include only if the goal needs it
@@ -348,6 +337,21 @@ ifeq ($(filter $(MAKECMDGOALS),$(MAKEFILE_TARGETS_WITHOUT_INCLUDE)),)
 -include $(DEPEND)
 endif
 
+#-------------------------------------------------
+# generated
+#-------------------------------------------------
+
+$(SRC)/generated/lib_entries.hxx: $(DEVSOURCES)
+	@echo creating $@
+	$(PYTHON) create_lib_entries.py $^ > $@
+
+$(SRC)/generated/nld_devinc.h: $(DEVSOURCES)
+	@echo creating $@
+	$(PYTHON) create_devinc.py $^ > $@
+
+.PHONY: generated
+generated: ../generated/lib_entries.hxx ../generated/nld_devinc.h
+
 #-------------------------------------------------
 # clang tidy
 #-------------------------------------------------

src/lib/netlist/devices/net_lib.cpp

@@ -8,8 +8,8 @@
 // ***************************************************************************
 
 #include "net_lib.h"
-#include "netlist/nl_factory.h"
-#include "netlist/solver/nld_solver.h"
+#include "nl_factory.h"
+#include "solver/nld_solver.h"
 
 
 #define NETLIB_DEVICE_DECL(chip) extern factory::constructor_ptr_t decl_ ## chip

src/lib/netlist/devices/net_lib.h

@@ -10,7 +10,7 @@
 /// Discrete netlist implementation.
 ///
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 #ifdef RES_R
 #warning "Do not include rescap.h in a netlist environment"
@@ -108,12 +108,12 @@ NETLIST_EXTERNAL(base_lib)
 #include "../macro/nlm_roms_lib.h"
 #include "../macro/nlm_ttl74xx_lib.h"
 
-#include "netlist/analog/nld_bjt.h"
-#include "netlist/analog/nld_fourterm.h"
-#include "netlist/analog/nld_mosfet.h"
-#include "netlist/analog/nld_opamps.h"
-#include "netlist/analog/nld_switches.h"
-#include "netlist/analog/nld_twoterm.h"
+#include "../analog/nld_bjt.h"
+#include "../analog/nld_fourterm.h"
+#include "../analog/nld_mosfet.h"
+#include "../analog/nld_opamps.h"
+#include "../analog/nld_switches.h"
+#include "../analog/nld_twoterm.h"
 
 #include "nld_legacy.h"
 #endif

src/lib/netlist/devices/nld_2102A.cpp

@@ -22,7 +22,7 @@
  */
 
 #include "nld_2102A.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 #define ADDR2BYTE(a)    ((a) >> 3)
 #define ADDR2BIT(a)     ((a) & 0x7)

src/lib/netlist/devices/nld_2102A.h

@@ -4,7 +4,7 @@
 #ifndef NLD_2102A_H_
 #define NLD_2102A_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // expects: RAM_2102A(name, cCEQ, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cA9, cRWQ, cDI)
 #define RAM_2102A(...)                                           \

src/lib/netlist/devices/nld_4006.h

@@ -4,7 +4,7 @@
 #ifndef NLD_4006_H_
 #define NLD_4006_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 #define CD4006(name)                                                            \
 		NET_REGISTER_DEV(CD4006, name)

src/lib/netlist/devices/nld_4013.cpp

@@ -39,8 +39,8 @@
  *  FIXME: Check that (*) is emulated properly
  */
 
-#include "netlist/nl_base.h"
-#include "netlist/nl_factory.h"
+#include "nl_base.h"
+#include "nl_factory.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_4013.h

@@ -4,7 +4,7 @@
 #ifndef NLD_4013_H_
 #define NLD_4013_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage: CD4013(name, cCLOCK, cDATA, cRESET, cSET)
 #define CD4013(...)                                                            \

src/lib/netlist/devices/nld_4017.h

@@ -4,7 +4,7 @@
 #ifndef NLD_4017_H_
 #define NLD_4017_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 #define CD4017(name)                                                            \
 		NET_REGISTER_DEV(CD4017, name)

src/lib/netlist/devices/nld_4020.h

@@ -4,7 +4,7 @@
 #ifndef NLD_4020_H_
 #define NLD_4020_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage       : CD4020(name)
 #define CD4020(...)                                                    \

src/lib/netlist/devices/nld_4053.cpp

@@ -25,8 +25,8 @@
 
 #include "nld_4053.h"
 
-#include "netlist/analog/nlid_twoterm.h"
-#include "netlist/solver/nld_solver.h"
+#include "analog/nlid_twoterm.h"
+#include "solver/nld_solver.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_4053.h

@@ -3,7 +3,7 @@
 #ifndef NLD_4053_H_
 #define NLD_4053_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // FIXME: Implement pure CMOS version
 

src/lib/netlist/devices/nld_4066.cpp

@@ -23,8 +23,8 @@
 
 #include "nld_4066.h"
 
-#include "netlist/analog/nlid_twoterm.h"
-#include "netlist/solver/nld_solver.h"
+#include "analog/nlid_twoterm.h"
+#include "solver/nld_solver.h"
 
 
 namespace netlist

src/lib/netlist/devices/nld_4066.h

@@ -4,7 +4,7 @@
 #ifndef NLD_4066_H_
 #define NLD_4066_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // FIXME: Implement pure CMOS version
 

src/lib/netlist/devices/nld_4316.cpp

@@ -23,8 +23,8 @@
  */
 
 #include "nld_4316.h"
-#include "netlist/analog/nlid_twoterm.h"
-#include "netlist/solver/nld_solver.h"
+#include "analog/nlid_twoterm.h"
+#include "solver/nld_solver.h"
 
 namespace netlist { namespace devices {
 

src/lib/netlist/devices/nld_4316.h

@@ -4,7 +4,7 @@
 #ifndef NLD_4316_H_
 #define NLD_4316_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 #define CD4316_GATE(name)                                                       \
 		NET_REGISTER_DEV(CD4316_GATE, name)

src/lib/netlist/devices/nld_74107.cpp

@@ -62,7 +62,7 @@
  */
 
 #include "nld_74107.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_74107.h

@@ -4,7 +4,7 @@
 #ifndef NLD_74107_H_
 #define NLD_74107_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 #define TTL_74107(...)                                                         \
 		NET_REGISTER_DEVEXT(TTL_74107, __VA_ARGS__)

src/lib/netlist/devices/nld_74113.cpp

@@ -58,7 +58,7 @@
  */
 
 #include "nld_74113.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 // FIXME: this can probably be merged with nld_7473.cpp
 // FIXME: timing, see 74107 for example, use template

src/lib/netlist/devices/nld_74113.h

@@ -4,7 +4,7 @@
 #ifndef NLD_74113_H_
 #define NLD_74113_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage: TTL_74113(name, cCLK, cJ, cK, cCLRQ)
 #define TTL_74113(...)                                                        \

src/lib/netlist/devices/nld_74123.cpp

@@ -46,7 +46,7 @@
  *
  */
 
-#include "netlist/analog/nlid_twoterm.h"
+#include "analog/nlid_twoterm.h"
 #include "nlid_system.h"
 
 namespace netlist

src/lib/netlist/devices/nld_74123.h

@@ -4,7 +4,7 @@
 #ifndef NLD_74123_H_
 #define NLD_74123_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 #define TTL_74123(name)                                                         \
 		NET_REGISTER_DEV(TTL_74123, name)

src/lib/netlist/devices/nld_74125.h

@@ -8,7 +8,7 @@
 #ifndef NLD_74125_H_
 #define NLD_74125_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 #define TTL_74125_GATE(...)                                                    \
 		NET_REGISTER_DEV(TTL_74125_GATE, __VA_ARGS__)

src/lib/netlist/devices/nld_74153.cpp

@@ -43,7 +43,7 @@
  */
 
 #include "nld_74153.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_74153.h

@@ -4,7 +4,7 @@
 #ifndef NLD_74153_H_
 #define NLD_74153_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage: TTL_74153(name, cC0, cC1, cC2, cC3, cA, cB, cG)
 #define TTL_74153(...)                                                        \

src/lib/netlist/devices/nld_74164.cpp

@@ -47,7 +47,7 @@
 **********************************************************************/
 
 #include "nld_74164.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 // FIXME: clk input to be separated - only falling edge relevant
 

src/lib/netlist/devices/nld_74164.h

@@ -4,7 +4,7 @@
 #ifndef NLD_74164_H_
 #define NLD_74164_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage: TTL_74164(name, cA, cB, cCLRQ, cCLK)
 #define TTL_74164(...)                                                        \

src/lib/netlist/devices/nld_74165.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "nld_74165.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_74165.h

@@ -4,7 +4,7 @@
 #ifndef NLD_74165_H_
 #define NLD_74165_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage: TTL_74165(name, cCLK, cCLKINH, cSH_LDQ, cSER, cA, cB, cC, cD, cE, cF, cG, cH)
 #define TTL_74165(...)                                                        \

src/lib/netlist/devices/nld_74166.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "nld_74166.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 // FIXME: separate handlers for inputs
 

src/lib/netlist/devices/nld_74166.h

@@ -4,7 +4,7 @@
 #ifndef NLD_74166_H_
 #define NLD_74166_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage: TTL_74166(name, cCLK, cCLKINH, cSH_LDQ, cSER, cA, cB, cC, cD, cE, cF, cG, cH, cCLRQ)
 #define TTL_74166(...)                                                        \

src/lib/netlist/devices/nld_74174.cpp

@@ -34,7 +34,7 @@
  */
 
 #include "nld_74174.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_74174.h

@@ -4,7 +4,7 @@
 #ifndef NLD_74174_H_
 #define NLD_74174_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage: TTL_74174(name, cCLK, cD1, cD2, cD3, cD4, cD5, cD6, cCLRQ)
 #define TTL_74174(...)                                                        \

src/lib/netlist/devices/nld_74175.cpp

@@ -34,7 +34,7 @@
  */
 
 #include "nld_74175.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 // FIXME: optimize
 

src/lib/netlist/devices/nld_74175.h

@@ -4,7 +4,7 @@
 #ifndef NLD_74175_H_
 #define NLD_74175_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage       : TTL_74175(name, pCLK, pD1, pD2, pD3, pD4, pCLRQ)
 // auto connect: VCC, GND

src/lib/netlist/devices/nld_74192.cpp

@@ -27,7 +27,7 @@
  */
 
 #include "nld_74192.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_74192.h

@@ -4,7 +4,7 @@
 #ifndef NLD_74192_H_
 #define NLD_74192_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage       : TTL_74192(name, pA, pB, pC, pD, pCLEAR, pLOADQ, pCU, pCD)
 // auto connect: VCC, GND

src/lib/netlist/devices/nld_74193.cpp

@@ -24,7 +24,7 @@
  */
 
 #include "nld_74193.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_74193.h

@@ -4,7 +4,7 @@
 #ifndef NLD_74193_H_
 #define NLD_74193_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage       : TTL_74193(name, pA, pB, pC, pD, pCLEAR, pLOADQ, pCU, pCD)
 // auto connect: VCC, GND

src/lib/netlist/devices/nld_74194.cpp

@@ -25,7 +25,7 @@
 
 
 #include "nld_74194.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_74194.h

@@ -3,7 +3,7 @@
 #ifndef NLD_74194_H_
 #define NLD_74194_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage       : TTL_74194(name, pCLK, pS0, pS1, pSRIN, pA, pB, pC, pD, pSLIN, pCLRQ)
 // auto connect: VCC, GND

src/lib/netlist/devices/nld_74365.cpp

@@ -23,7 +23,7 @@
  */
 
 #include "nld_74365.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_74365.h

@@ -3,7 +3,7 @@
 #ifndef NLD_74365_H_
 #define NLD_74365_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage       : TTL_74365(name, pG1Q, pG2Q, pA1, pA2, pA3, pA4, pA5, pA6)
 // auto connect: VCC, GND

src/lib/netlist/devices/nld_74377.cpp

@@ -49,7 +49,7 @@
  */
 
 #include "nld_74377.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_74377.h

@@ -4,7 +4,7 @@
 #ifndef NLD_74377_H_
 #define NLD_74377_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 
 #define TTL_74377_GATE(name)                                                   \

src/lib/netlist/devices/nld_74393.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "nld_74393.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_74393.h

@@ -4,7 +4,7 @@
 #ifndef NLD_74393_H_
 #define NLD_74393_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage: TTL_74393(name, cCP, cMR)
 #define TTL_74393(...)                                                        \

src/lib/netlist/devices/nld_7448.h

@@ -4,7 +4,7 @@
 #ifndef NLD_7448_H_
 #define NLD_7448_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage       : TTL_7448(name, pA, pB, pC, pD, pLTQ, pBIQ, pRBIQ)
 // auto connect: VCC, GND

src/lib/netlist/devices/nld_7450.cpp

@@ -22,7 +22,7 @@
  */
 
 #include "nld_7450.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_7450.h

@@ -4,7 +4,7 @@
 #ifndef NLD_7450_H_
 #define NLD_7450_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage: TTL_7450_ANDORINVERT(name, cI1, cI2, cI3, cI4)
 #define TTL_7450_ANDORINVERT(...)                                              \

src/lib/netlist/devices/nld_7473.cpp

@@ -58,7 +58,7 @@
  */
 
 #include "nld_7473.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_7473.h

@@ -4,7 +4,7 @@
 #ifndef NLD_7473_H_
 #define NLD_7473_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage: TTL_7473(name, cCLK, cJ, cK, cCLRQ)
 #define TTL_7473(...)                                                          \

src/lib/netlist/devices/nld_7474.cpp

@@ -41,7 +41,7 @@
  */
 
 #include "nld_7474.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 #include <array>
 

src/lib/netlist/devices/nld_7474.h

@@ -4,7 +4,7 @@
 #ifndef NLD_7474_H_
 #define NLD_7474_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage: TTL_7474(name, cCLK, cD, cCLRQ, cPREQ)
 #define TTL_7474(...)                                             \

src/lib/netlist/devices/nld_7475.cpp

@@ -35,7 +35,7 @@
  */
 
 #include "nld_7475.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_7475.h

@@ -4,7 +4,7 @@
 #ifndef NLD_7475_H_
 #define NLD_7475_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 #define TTL_7475_GATE(...)                                                     \
 		NET_REGISTER_DEVEXT(TTL_7475_GATE, __VA_ARGS__)

src/lib/netlist/devices/nld_7483.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "nld_7483.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_7483.h

@@ -4,7 +4,7 @@
 #ifndef NLD_7483_H_
 #define NLD_7483_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage: TTL_7483(name, cA1, cA2, cA3, cA4, cB1, cB2, cB3, cB4, cCI)
 #define TTL_7483(...)                                                     \

src/lib/netlist/devices/nld_7485.cpp

@@ -23,7 +23,7 @@
  */
 
 #include "nld_7485.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_7485.h

@@ -4,7 +4,7 @@
 #ifndef NLD_7485_H_
 #define NLD_7485_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage: TTL_7485(name, cA0, cA1, cA2, cA3, cB0, cB1, cB2, cB3, cLTIN, cEQIN, cGTIN)
 #define TTL_7485(...)                                                     \

src/lib/netlist/devices/nld_7490.cpp

@@ -53,7 +53,7 @@
  */
 
 #include "nld_7490.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_7490.h

@@ -4,7 +4,7 @@
 #ifndef NLD_7490_H_
 #define NLD_7490_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage: TTL_7490(name, cA, cB, cR1, cR2, cR91, cR92)
 #define TTL_7490(...)                                                     \

src/lib/netlist/devices/nld_7492.cpp

@@ -50,7 +50,7 @@
  *
  */
 
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_7492.h

@@ -4,7 +4,7 @@
 #ifndef NLD_7492_H_
 #define NLD_7492_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage: TTL_7492(name, cA, cB, cR1, cR2)
 #define TTL_7492(...)                                                     \

src/lib/netlist/devices/nld_7493.cpp

@@ -55,7 +55,7 @@
  */
 
 #include "nld_7493.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 
 namespace netlist

src/lib/netlist/devices/nld_7493.h

@@ -4,7 +4,7 @@
 #ifndef NLD_7493_H_
 #define NLD_7493_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage: TTL_7493(name, cCLKA, cCLKB, cR1, cR2)
 #define TTL_7493(...)                                                     \

src/lib/netlist/devices/nld_7497.cpp

@@ -38,7 +38,7 @@
  */
 
 #include "nld_7497.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_7497.h

@@ -4,7 +4,7 @@
 #ifndef NLD_7497_H_
 #define NLD_7497_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage: TTL_7497(name, cCLK, cSTRB, cEN, cUNITY, cCLR, cB0, cB1, cB2, cB3, cB4, cB5)
 #define TTL_7497(...)                                                     \

src/lib/netlist/devices/nld_74ls629.cpp

@@ -60,7 +60,7 @@
 
 
 #include "nld_74ls629.h"
-#include "netlist/analog/nlid_twoterm.h"
+#include "analog/nlid_twoterm.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_74ls629.h

@@ -4,7 +4,7 @@
 #ifndef NLD_74LS629_H_
 #define NLD_74LS629_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 #define SN74LS629(name, ...)                                                  \
 		NET_REGISTER_DEVEXT(SN74LS629, name,__VA_ARGS__)

src/lib/netlist/devices/nld_8277.cpp

@@ -19,7 +19,7 @@
  */
 
 #include "nld_8277.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_8277.h

@@ -4,7 +4,7 @@
 #ifndef NLD_8277_H_
 #define NLD_8277_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage       : TTL_8277(name, pRESET, pCLK, pCLKA, pD0A, pD1A, pDSA, pCLKB, pD0B, pD1B, pDSB)
 // auto connect: VCC, GND

src/lib/netlist/devices/nld_82S115.cpp

@@ -26,7 +26,7 @@
  */
 
 #include "nld_82S115.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_82S115.h

@@ -4,7 +4,7 @@
 #ifndef NLD_82S115_H_
 #define NLD_82S115_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // expects: PROM_82S115(name, cCE1Q, cCE2, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cSTROBE)
 #define PROM_82S115(...)                                           \

src/lib/netlist/devices/nld_82S16.cpp

@@ -23,7 +23,7 @@
  */
 
 #include "nld_82S16.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_82S16.h

@@ -4,7 +4,7 @@
 #ifndef NLD_82S16_H_
 #define NLD_82S16_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 #define TTL_82S16(name)                                     \
 		NET_REGISTER_DEV(TTL_82S16, name)

src/lib/netlist/devices/nld_9316.h

@@ -4,7 +4,7 @@
 #ifndef NLD_9316_H_
 #define NLD_9316_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage: TTL_9316(name, cCLK, cENP, cENT, cCLRQ, cLOADQ, cA, cB, cC, cD)
 #define TTL_9316(...)                                                          \

src/lib/netlist/devices/nld_9321.cpp

@@ -19,7 +19,7 @@
  */
 
 #include "nld_9321.h"
-#include "netlist/nl_base.h"
+#include "nl_base.h"
 
 namespace netlist
 {

src/lib/netlist/devices/nld_9321.h

@@ -4,7 +4,7 @@
 #ifndef NLD_9321_H_
 #define NLD_9321_H_
 
-#include "netlist/nl_setup.h"
+#include "../nl_setup.h"
 
 // usage: TTL_9321(name, cAE, cA0, cA1, cBE, cB0, cB1)
 #define TTL_9321(...)                                                     \