fix for #87, replacing - with _ in module protocol_multiplex

Makefile.dep

@@ -14,8 +14,8 @@ ifneq (,$(findstring uart0,$(USEMODULE)))
 endif
 
 ifneq (,$(findstring cc110x,$(USEMODULE)))
-	ifeq (,$(findstring protocol-multiplex,$(USEMODULE)))
-		USEMODULE += protocol-multiplex
+	ifeq (,$(findstring protocol_multiplex,$(USEMODULE)))
+		USEMODULE += protocol_multiplex
 	endif
 endif
 

sys/Makefile

@@ -70,7 +70,7 @@ endif
 ifneq (,$(findstring net_help,$(USEMODULE)))
     DIRS += net/net_help
 endif
-ifneq (,$(findstring protocol-multiplex,$(USEMODULE)))
+ifneq (,$(findstring protocol_multiplex,$(USEMODULE)))
     DIRS += net/protocol-multiplex
 endif
 ifneq (,$(findstring sixlowpan,$(USEMODULE)))

sys/net/protocol-multiplex/Makefile

@@ -1,4 +1,4 @@
-MODULE:=$(shell basename $(CURDIR))
+MODULE:=protocol_multiplex
 INCLUDES = -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include
 
 include $(RIOTBASE)/Makefile.base