Corrected some more paths for the new location of the library.

Makefile

@@ -44,18 +44,15 @@ $(EXAMPLE_DIRS): lib
 examples: $(EXAMPLE_DIRS)
 	$(Q)true
 
-doc:
-	$(Q)$(MAKE) -C doc html
-
 # Bleh http://www.makelinux.net/make3/make3-CHP-6-SECT-1#make3-CHP-6-SECT-1
-clean: cleanheaders
-	$(Q)for i in $(LIB_DIRS) \
-		     $(EXAMPLE_DIRS); do \
+clean:
+	$(Q)$(MAKE) -C libopencm3 clean
+	$(Q)for i in $(EXAMPLE_DIRS); do \
 		if [ -d $$i ]; then \
 			printf "  CLEAN   $$i\n"; \
 			$(MAKE) -C $$i clean SRCLIBDIR=$(SRCLIBDIR) || exit $?; \
 		fi; \
 	done
 
-.PHONY: build lib examples $(EXAMPLE_DIRS) install doc clean
+.PHONY: build lib examples $(EXAMPLE_DIRS) install clean
 

examples/stm32/f1/stm32vl-discovery/adc-dac-printf/Makefile

@@ -18,7 +18,7 @@
 ##
 
 BINARY = adc-dac-printf
-LDSCRIPT = ../../../../../lib/stm32/f1/stm32f100xb.ld
+LDSCRIPT = ../../../../../libopencm3/lib/stm32/f1/stm32f100xb.ld
 
 include ../../Makefile.include
 

examples/stm32/l1/stm32l-discovery/button-irq-printf-lowpower/Makefile

@@ -18,7 +18,7 @@
 ##
 
 BINARY = main
-LDSCRIPT = ../../../../../lib/stm32/l1/stm32l15xxb.ld
+LDSCRIPT = ../../../../../libopencm3/lib/stm32/l1/stm32l15xxb.ld
 
 include ../../Makefile.include
 

examples/stm32/l1/stm32l-discovery/button-irq-printf/Makefile

@@ -18,7 +18,7 @@
 ##
 
 BINARY = main
-LDSCRIPT = ../../../../../lib/stm32/l1/stm32l15xxb.ld
+LDSCRIPT = ../../../../../libopencm3/lib/stm32/l1/stm32l15xxb.ld
 
 include ../../Makefile.include
 

examples/stm32/l1/stm32l-discovery/miniblink/Makefile

@@ -19,7 +19,7 @@
 
 BINARY = miniblink
 
-LDSCRIPT = ../../../../../lib/stm32/l1/stm32l15xxb.ld
+LDSCRIPT = ../../../../../libopencm3/lib/stm32/l1/stm32l15xxb.ld
 
 include ../../Makefile.include
 

examples/stm32/l1/stm32l-discovery/usart/Makefile

@@ -19,7 +19,7 @@
 
 BINARY = usart
 
-LDSCRIPT = ../../../../../lib/stm32/l1/stm32l15xxb.ld
+LDSCRIPT = ../../../../../libopencm3/lib/stm32/l1/stm32l15xxb.ld
 
 include ../../Makefile.include