lcd.mk is now main Makefile again

lcd.mk

@@ -3,21 +3,29 @@ ifeq ($(LCDLIB),)
 	LCDLIB =	$(CHIBIOS)/ext/lcd
 endif
 
-include 	$(LCDLIB)/drivers/drivers.mk
-include		$(LCDLIB)/glcd/glcd.mk
-include		$(LCDLIB)/touchpad/touchpad.mk
-include		$(LCDLIB)/graph/graph.mk
-include 	$(LCDLIB)/gui/gui.mk
 
-LCDSRC = 	$(LCD_DRIVERS_SRC) \
-			$(LCD_GLCD_SRC) \
-			$(LCD_TOUCHPAD_SRC) \
-			$(LCD_GRAPH_SRC) \
-			$(LCD_GUI_SRC)
+include $(LCDLIB)/halext/halext.mk
+
+
+
+# this is used for the old structure - will get removed soon
+
+#include 	$(LCDLIB)/drivers/drivers.mk
+#include		$(LCDLIB)/glcd/glcd.mk
+#include		$(LCDLIB)/touchpad/touchpad.mk
+#include		$(LCDLIB)/graph/graph.mk
+#include 	$(LCDLIB)/gui/gui.mk
+
+#LCDSRC = 	$(LCD_DRIVERS_SRC) \
+#			$(LCD_GLCD_SRC) \
+#			$(LCD_TOUCHPAD_SRC) \
+#			$(LCD_GRAPH_SRC) \
+#			$(LCD_GUI_SRC)
+
+#LCDINC = 	$(LCDLIB) \
+#			$(LCD_DRIVERS_INC) \
+#			$(LCD_GLCD_INC) \
+#			$(LCD_TOUCHPAD_INC) \
+#			$(LCD_GRAPH_INC) \
+#			$(LCD_GUI_INC)
 
-LCDINC = 	$(LCDLIB) \
-			$(LCD_DRIVERS_INC) \
-			$(LCD_GLCD_INC) \
-			$(LCD_TOUCHPAD_INC) \
-			$(LCD_GRAPH_INC) \
-			$(LCD_GUI_INC)