moved bitmap scroller stuff to dedicated directory

Makefile

@@ -40,6 +40,7 @@ include defaults.mk
 	@ echo "checking in which subdirs to build"
 	@ $(RM) -f $@
 	@ echo "SUBDIRS += animations" >> $@
+	@ echo "SUBDIRS += animations/bitmapscroller" >> $@
 	@ echo "SUBDIRS += smallani" >> $@
 	@ (for subdir in `grep -e "^#define .*_SUPPORT" autoconf.h \
 	      | sed -e "s/^#define //" -e "s/_SUPPORT.*//" \

animations/Makefile

@@ -37,30 +37,6 @@ ifeq ($(ANIMATION_LTN_ANT),y)
   SRC += ltn_ant.c
 endif
 
-ifeq ($(ANIMATION_BMSCROLLER),y)
-  SRC += bitmapscroller.c
-endif
-
-ifeq ($(ANIMATION_LABORLOGO),y)
-  SRC += laborlogo.c
-endif
-
-ifeq ($(ANIMATION_AMPHIBIAN),y)
-  SRC += amphibian.c
-endif
-
-ifeq ($(ANIMATION_LOGO_OOS),y)
-  SRC += outofspec.c
-endif
-
-ifeq ($(ANIMATION_FAIRYDUST),y)
-  SRC += fairydust.c
-endif
-
-ifeq ($(ANIMATION_IDEENPARK),y)
-  SRC += ideenpark.c
-endif
-
 ifneq (,$(filter y,$(ANIMATION_PLASMA) $(ANIMATION_PSYCHEDELIC)))
   SRC += fpmath_patterns.c
 endif

animations/bitmapscroller/Makefile

@@ -0,0 +1,29 @@
+TOPDIR = ../..
+
+include $(TOPDIR)/defaults.mk
+
+ifeq ($(ANIMATION_BMSCROLLER),y)
+  SRC = bitmapscroller.c
+endif
+
+ifeq ($(ANIMATION_LABORLOGO),y)
+  SRC += laborlogo.c
+endif
+
+ifeq ($(ANIMATION_AMPHIBIAN),y)
+  SRC += amphibian.c
+endif
+
+ifeq ($(ANIMATION_LOGO_OOS),y)
+  SRC += outofspec.c
+endif
+
+ifeq ($(ANIMATION_FAIRYDUST),y)
+  SRC += fairydust.c
+endif
+
+ifeq ($(ANIMATION_IDEENPARK),y)
+  SRC += ideenpark.c
+endif
+
+include $(TOPDIR)/rules.mk

animations/amphibian.c → animations/bitmapscroller/amphibian.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <assert.h>
 
-#include "../compat/pgmspace.h"
+#include "../../compat/pgmspace.h"
 #include "bitmapscroller.h"
 #include "amphibian.h"
 

animations/bitmapscroller.c → animations/bitmapscroller/bitmapscroller.c

@@ -13,10 +13,10 @@
 #include <stdint.h>
 #include <assert.h>
 
-#include "../random/prng.h"
-#include "../util.h"
-#include "../autoconf.h"
-#include "../pixel.h"
+#include "../../random/prng.h"
+#include "../../util.h"
+#include "../../autoconf.h"
+#include "../../pixel.h"
 #include "bitmapscroller.h"
 
 

animations/bitmapscroller/config.in

@@ -0,0 +1,7 @@
+dep_bool_menu "Bitmap Scroller" ANIMATION_BMSCROLLER y $RANDOM_SUPPORT
+	dep_bool "LABOR Logo"       ANIMATION_LABORLOGO $ANIMATION_BMSCROLLER
+	dep_bool "Amphibian"        ANIMATION_AMPHIBIAN $ANIMATION_BMSCROLLER
+	dep_bool "Out of Spec Logo" ANIMATION_LOGO_OOS  $ANIMATION_BMSCROLLER
+	dep_bool "Fairydust"        ANIMATION_FAIRYDUST $ANIMATION_BMSCROLLER
+	dep_bool "Ideenpark"        ANIMATION_IDEENPARK $ANIMATION_BMSCROLLER
+endmenu

animations/fairydust.c → animations/bitmapscroller/fairydust.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <assert.h>
 
-#include "../compat/pgmspace.h"
+#include "../../compat/pgmspace.h"
 #include "bitmapscroller.h"
 #include "fairydust.h"
 

animations/bitmapscroller/fairydust.h

@@ -0,0 +1,6 @@
+#ifndef LOGO_FAIRYDUST_H_
+#define LOGO_FAIRYDUST_H_
+
+void fairydust();
+
+#endif /* LOGO_28C3_H_ */

animations/ideenpark.c → animations/bitmapscroller/ideenpark.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <assert.h>
 
-#include "../compat/pgmspace.h"
+#include "../../compat/pgmspace.h"
 #include "bitmapscroller.h"
 #include "ideenpark.h"
 

animations/laborlogo.c → animations/bitmapscroller/laborlogo.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <assert.h>
 
-#include "../compat/pgmspace.h"
+#include "../../compat/pgmspace.h"
 #include "bitmapscroller.h"
 #include "laborlogo.h"
 

animations/outofspec.c → animations/bitmapscroller/outofspec.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <assert.h>
 
-#include "../compat/pgmspace.h"
+#include "../../compat/pgmspace.h"
 #include "bitmapscroller.h"
 #include "outofspec.h"
 

animations/config.in

@@ -49,14 +49,8 @@ comment "Animations"
 		int "Request Timeout (ms)" TIME_UPDATE_TIMEOUT     50
 	endmenu
 
-	dep_bool_menu "Bitmap Scroller" ANIMATION_BMSCROLLER y $RANDOM_SUPPORT
-		dep_bool "LABOR Logo"       ANIMATION_LABORLOGO $ANIMATION_BMSCROLLER
-		dep_bool "Amphibian"        ANIMATION_AMPHIBIAN $ANIMATION_BMSCROLLER
-		dep_bool "Out of Spec Logo" ANIMATION_LOGO_OOS  $ANIMATION_BMSCROLLER
-		dep_bool "Fairydust"        ANIMATION_FAIRYDUST $ANIMATION_BMSCROLLER
-		dep_bool "Ideenpark"        ANIMATION_IDEENPARK $ANIMATION_BMSCROLLER
-	endmenu
-	
+	source animations/bitmapscroller/config.in
+
 	mainmenu_option next_comment
 	comment "Fixed-point math patterns"
 		bool "Plasma"  ANIMATION_PLASMA  $ANIMATION_FIXEDPOINT

animations/fairydust.h

@@ -1,6 +0,0 @@
-#ifndef LOGO_28C3_H_
-#define LOGO_28C3_H_
-
-void fairydust();
-
-#endif /* LOGO_28C3_H_ */

display_loop.c

@@ -12,11 +12,11 @@
 #include "animations/flyingdots.h"
 #include "animations/breakout_demo.h"
 #include "animations/ltn_ant.h"
-#include "animations/amphibian.h"
-#include "animations/laborlogo.h"
-#include "animations/outofspec.h"
-#include "animations/fairydust.h"
-#include "animations/ideenpark.h"
+#include "animations/bitmapscroller/laborlogo.h"
+#include "animations/bitmapscroller/amphibian.h"
+#include "animations/bitmapscroller/outofspec.h"
+#include "animations/bitmapscroller/fairydust.h"
+#include "animations/bitmapscroller/ideenpark.h"
 #include "animations/fpmath_patterns.h"
 #include "animations/mherweg.h"
 #include "animations/blackhole.h"