Changeset 10255

Timestamp:

09/01/08 16:21:05 (5 years ago)

Author:

eko

Message:

styles size reduction

Location:

src/router/services

Files:

• Makefile (modified) (1 diff)
• sysinit/sysinit.c (modified) (1 diff)

src/router/services/Makefile

@@ -412 +412 @@
 CFLAGS += -DHAVE_IPROUTE2
 endif
+
+ifeq ($(CONFIG_BLUE),y)
+CFLAGS += -DHAVE_BLUE
+endif
+ifeq ($(CONFIG_CYAN),y)
+CFLAGS += -DHAVE_CYAN
+endif
+ifeq ($(CONFIG_ELEGANT),y)
+CFLAGS += -DHAVE_ELEGANT
+endif
+ifeq ($(CONFIG_RED),y)
+CFLAGS += -DHAVE_RED
+endif
+ifeq ($(CONFIG_YELLOW),y)
+CFLAGS += -DHAVE_YELLOW
+endif
+ifeq ($(CONFIG_GREEN),y)
+CFLAGS += -DHAVE_GREEN
+endif
+ifeq ($(CONFIG_ORANGE),y)
+CFLAGS += -DHAVE_ORANGE
+endif
+
 ifeq ($(CONFIG_TELCOM),y)
 CFLAGS += -DHAVE_TELCOM

src/router/services/sysinit/sysinit.c

@@ -1525 +1525 @@
         // if dist_type micro, check styles, and force to elegant if needed
         char *style = nvram_safe_get( "router_style" );
-
-        if( !strstr( "blue cyan elegant green orange red yellow", style ) )
+        int need_elegant = 1;
+
+//      if( !strstr( "blue cyan elegant green orange red yellow", style ) )
+#ifdef HAVE_BLUE
+    if( !strcmp( style, "blue" ) )
+        need_elegant = 0;       
+    else
+#endif
+#ifdef HAVE_CYAN
+    if( !strcmp( style, "cyan" ) )
+        need_elegant = 0;
+    else
+#endif
+#ifdef HAVE_YELLOW
+    if( !strcmp( style, "yellow" ) )
+        need_elegant = 0;
+    else
+#endif
+#ifdef HAVE_GREEN
+    if( !strcmp( style, "green" ) )
+        need_elegant = 0;
+    else
+#endif
+#ifdef HAVE_ORANGE
+    if( !strcmp( style, "orange" ) )
+        need_elegant = 0;
+    else
+#endif
+#ifdef HAVE_RED
+    if( !strcmp( style, "red" ) )
+        need_elegant = 0;
+#endif
+
+        
+        if (need_elegant)                       // default to elegant
         {
             nvram_set( "router_style", "elegant" );