better for-pic, better clean

diff --git a/Makefile b/Makefile
index 39bf7c0507d2992f168097550886c6f98c5ea2e1..beb1f7ce5c2ce6887e4ede3a0834c026bbf01ad4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 recurse = set -e; for f in $($(1)_DIRS); do $(MAKE) -C $$f $(2); done
 
 PIC_DIRS=      iwjpictest cebpic detpic
-HOST_DIRS=     layout hostside
+HOST_DIRS=     pcb layout hostside
 
 all:
        $(call recurse,HOST,recurse)
@@ -14,7 +14,7 @@ host_%:
        $(call recurse,HOST,$*)
 
 pic:
-       $(MAKE) -C layout for-pic
+       $(call recurse,HOST,for-pic)
        $(call recurse,PIC,)
 
 pic_%:

diff --git a/hostside/Makefile b/hostside/Makefile
index 67f7942969478b61689305aa88ab155753c264ff..a56c4609a7c600437694c6a1bd48ee085fe6e678 100644 (file)
--- a/hostside/Makefile
+++ b/hostside/Makefile
@@ -9,6 +9,7 @@ TARGETS=        hostside hostside-old gui-plan-bot
 
 default:       all
 recurse:       all
+for-pic:
 all:           $(TARGETS)
 
 hostside-old:  serialio.o nmra.o main.o encode.o utils.o
@@ -46,5 +47,6 @@ safety:               safety.o utils.o trackloc.o ../layout/ours.layout-data.o
 
 clean:
                rm -f *.o *.d $(TARGETS) selectors.h
+               rm -f auproto-pic.h *~ core proto-expanded
 
 include $(wildcard *.d)

diff --git a/pcb/Makefile b/pcb/Makefile
index c23515fa49ed026dcefff92bb66daa599aedf6da..7f6c304ad5b39bc7de09037b399fbb4000879097 100644 (file)
--- a/pcb/Makefile
+++ b/pcb/Makefile
@@ -1,6 +1,6 @@
 
 default:       netlists
-
+for-pic:       netlists
 all:           default layers panel3.pcb
 
 o=>$@.new && mv -f $@.new $@
@@ -99,7 +99,8 @@ pcboprints:   reversers.oprints-l detectors.oprints-l
 
 clean:
                -rm -f -- *~ *.new
-               -rm -f reversers.net reversers.net-info
+               -rm -f *.hole-rep *.net *.net-info *.net-spec
+               -rm -f *.layers.dep panel3.pcb
 
 .PRECIOUS:     %.net-info %.net-spec
 .PRECIOUS:     $(OPRINTS)