Merge pull request #3542 from cgundogan/pr/trickle/cleanup

sys/trickle: Makefile and include guards cleanup

sys/Makefile

@@ -136,9 +136,6 @@ endif
 ifneq (,$(filter ng_slip,$(USEMODULE)))
     DIRS += net/link_layer/ng_slip
 endif
-ifneq (,$(filter trickle,$(USEMODULE)))
-    DIRS += trickle
-endif
 ifneq (,$(filter nhdp,$(USEMODULE)))
     DIRS += net/routing/nhdp
 endif

sys/include/trickle.h

@@ -22,8 +22,8 @@
  * @author  Cenk Gündoğan <cnkgndgn@gmail.com>
  */
 
-#ifndef _TRICKLE_H
-#define _TRICKLE_H
+#ifndef TRICKLE_H
+#define TRICKLE_H
 
 #ifdef __cplusplus
  extern "C" {
@@ -110,5 +110,5 @@ void trickle_callback(trickle_t *trickle);
 }
 #endif
 
-#endif /* _TRICKLE_H */
+#endif /* TRICKLE_H */
 /** @} */

sys/trickle/Makefile

@@ -1,3 +1 @@
-MODULE = trickle
-
 include $(RIOTBASE)/Makefile.base