build: cstats/httpd/mdu/mssl/nvram/rstats/shared: some improvements to Makefile

release/src-rt-6.x.4708/router/cstats/Makefile

@@ -3,38 +3,34 @@ include ../common.mak
 CFLAGS  = -Os -Wall $(EXTRACFLAGS) -Wsign-compare
 CFLAGS += -I$(SRCBASE)/include -I$(TOP)/shared -ffunction-sections -fdata-sections
 LDFLAGS = -ffunction-sections -fdata-sections -Wl,--gc-sections
-
-ifeq ($(TOMATO_EXPERIMENTAL),1)
-export CFLAGS += -DDEBUG_LOGMSG
-endif
+LIBS    =
 
 ifeq ($(TCONFIG_BCMARM),y)
  LIBS   += -lgcc_s
 endif
 
+ifeq ($(TOMATO_EXPERIMENTAL),1)
+ export CFLAGS += -DDEBUG_LOGMSG
+endif
+
 OBJS = cstats.o
 
 all: cstats
 
 cstats: $(OBJS)
 	@echo " [cstats] CC -o $@"
-ifeq ($(TCONFIG_BCMARM),y)
-	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) -L../nvram${BCMEX} -lnvram -L../shared -lshared $(LIBS)
-else
-	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) -L../nvram -lnvram -L../shared -lshared
-endif
-
+	@$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) -L../nvram${BCMEX} -lnvram -L../shared -lshared $(LIBS)
 	$(SIZECHECK)
 	$(CPTMP)
 
 clean:
-	rm -f cstats .*.depend
-	rm -f *.o
+	rm -f cstats *.o .*.depend
 
 install: all
-	@echo " [cstats] Installing..."
-	install -D -m 0700 cstats $(INSTALLDIR)/bin/cstats
-	$(STRIP) $(INSTALLDIR)/bin/cstats
+	@echo " [cstats] Installing as $(INSTALLDIR)/bin/cstats"
+	@install -D -m 0700 cstats $(INSTALLDIR)/bin/cstats
+	@$(STRIP) $(INSTALLDIR)/bin/cstats
+	@chmod 0500 $(INSTALLDIR)/bin/cstats
 
 %.o: %.c .%.depend
 	@echo " [cstats] CC $@"

release/src-rt-6.x.4708/router/httpd/Makefile

@@ -1,7 +1,9 @@
 include ../common.mak
 
-CFLAGS = -Os -Wall $(EXTRACFLAGS) -Wsign-compare
+CFLAGS  = -Os -Wall $(EXTRACFLAGS) -ffunction-sections -fdata-sections -Wsign-compare
 CFLAGS += -I$(SRCBASE) -I$(SRCBASE)/include -I. -I$(TOP)/shared
+LDFLAGS = -ffunction-sections -fdata-sections -Wl,--gc-sections
+LIBS    = -L$(TOP)/nvram${BCMEX} -lnvram -L$(TOP)/shared -lshared
 
 ifeq ($(TCONFIG_BCMARM),y)
  CFLAGS += -I$(SRCBASE)/shared/bcmwifi/include
@@ -9,17 +11,29 @@ CFLAGS += -I$(SRCBASE)/common/include
  LIBS   += -lgcc_s
 endif
 
+ifneq ($(TCONFIG_HTTPS),)
+ LIBS   += -L$(TOP)/mssl -lmssl
+ ifeq ($(TCONFIG_OPENSSL11),y)
+  CFLAGS += -I$(TOP)/openssl-1.1/include -DUSE_OPENSSL11
+  LIBS   += -L$(TOP)/openssl-1.1 -lssl -lcrypto
+  ifeq ($(TCONFIG_BCMARM),y)
+   LIBS   += -lpthread
+  endif
+ else
+  CFLAGS += -I$(TOP)/openssl/include
+  LIBS   += -L$(TOP)/openssl -lssl -lcrypto
+ endif
+endif
+
 ifeq ($(TOMATO_EXPERIMENTAL),1)
  export CFLAGS += -DDEBUG_LOGMSG
 endif
 
-OBJS = httpd.o cgi.o tomato.o version.o
-OBJS += misc.o dhcp.o upgrade.o traceping.o parser.o upnp.o ctnf.o
-OBJS += nvram.o log.o webio.o wl.o devlist.o ddns.o config.o bwm.o
-OBJS += blackhole.o utf8.o
-OBJS += cpuinfo.o
+OBJS    = httpd.o cgi.o tomato.o version.o misc.o dhcp.o upgrade.o \
+          traceping.o parser.o upnp.o ctnf.o nvram.o log.o webio.o \
+          wl.o devlist.o ddns.o config.o bwm.o blackhole.o utf8.o \
+          cpuinfo.o iptraffic.o
 
-OBJS += iptraffic.o
 ifeq ($(TCONFIG_USB),y)
  OBJS   += usb.o
  OBJS   += wwan.o
@@ -33,22 +47,6 @@ ifeq ($(TCONFIG_OPENVPN),y)
  OBJS   += openvpn.o
 endif
 
-LIBS += -L$(TOP)/nvram${BCMEX} -lnvram -L$(TOP)/shared -lshared
-
-ifneq ($(TCONFIG_HTTPS),)
-LIBS += -L$(TOP)/mssl -lmssl
-ifeq ($(TCONFIG_OPENSSL11),y)
-CFLAGS += -I$(TOP)/openssl-1.1/include -DUSE_OPENSSL11
-LIBS += -L$(TOP)/openssl-1.1 -lssl -lcrypto
-ifeq ($(TCONFIG_BCMARM),y)
-LIBS += -lpthread
-endif
-else
-CFLAGS += -I$(TOP)/openssl/include
-LIBS += -L$(TOP)/openssl -lssl -lcrypto
-endif
-endif
-
 ifeq ($(TCONFIG_PPTPD),y)
  OBJS   += pptpd.o
 endif
@@ -65,14 +63,12 @@ all: httpd
 
 httpd: $(OBJS)
 	@echo " [httpd] CC $@"
-	@$(CC) -o $@ $(OBJS) $(LIBS)
-ifneq ($(TCONFIG_BCMARM),y)
-	$(SIZECHECK)
-	$(CPTMP)
-endif
+	@$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
+	@$(SIZECHECK)
+	@$(CPTMP)
 
 install:
-	@echo " [httpd] Installing to $(INSTALLDIR)"
+	@echo " [httpd] Installing as $(INSTALLDIR)/usr/sbin/httpd"
 	@install -D httpd $(INSTALLDIR)/usr/sbin/httpd
 	@$(STRIP) $(INSTALLDIR)/usr/sbin/httpd
 	@chmod 0500 $(INSTALLDIR)/usr/sbin/httpd
@@ -80,12 +76,6 @@ install:
 clean:
 	rm -f httpd *.o .*.depend
 
-size: httpd
-ifneq ($(TCONFIG_BCMARM),y)
-	mipsel-uclibc-nm --print-size --size-sort httpd
-endif
-	@true
-
 %.o: %.c .%.depend
 	@echo " [httpd] CC $@"
 	@$(CC) $(CFLAGS) -o $@ -c $<

release/src-rt-6.x.4708/router/mdu/Makefile

@@ -1,18 +1,14 @@
 include ../common.mak
 
-CFLAGS	= -Os -Wall $(EXTRACFLAGS) -Wsign-compare
+CFLAGS  = -Os -Wall $(EXTRACFLAGS) -ffunction-sections -fdata-sections -Wsign-compare
 CFLAGS += -I$(SRCBASE)/include -I$(TOP)/shared
-LDFLAGS	=
+LDFLAGS = -ffunction-sections -fdata-sections -Wl,--gc-sections
 LIBS    = -L$(TOP)/nvram${BCMEX} -lnvram -L$(TOP)/shared -lshared
 
 ifeq ($(TCONFIG_BCMARM),y)
  LIBS   += -lgcc_s
 endif
 
-ifeq ($(TOMATO_EXPERIMENTAL),1)
-export CFLAGS += -DDEBUG_LOGMSG
-endif
-
 ifneq ($(TCONFIG_HTTPS),)
  CFLAGS += -I$(TOP)/$(OPENSSLDIR)/staged/usr/include
  LIBS   += -L$(TOP)/$(OPENSSLDIR)/staged/usr/lib -lssl -lcrypto
@@ -23,28 +19,31 @@ endif
 
 ifeq ($(or $(TCONFIG_BCMARM),$(TCONFIG_BBT),$(TCONFIG_NGINX)),y)
  CFLAGS += -DUSE_LIBCURL -I$(TOP)/zlib/staged/usr/include -I$(TOP)/libcurl/staged/usr/include
-LIBS += -L$(TOP)/zlib/staged/usr/lib -lz -L$(TOP)/libcurl/lib/.libs -lcurl -lpthread
+ LIBS   += -L$(TOP)/zlib/staged/usr/lib -L$(TOP)/libcurl/lib/.libs -lz -lcurl -lpthread
 else
  CFLAGS += -I$(TOP)/mssl
  LIBS   += -L$(TOP)/mssl -lmssl
 endif
 
+ifeq ($(TOMATO_EXPERIMENTAL),1)
+ export CFLAGS += -DDEBUG_LOGMSG
+endif
+
 OBJS = mdu.o
 
 all: mdu
 
 mdu: $(OBJS)
 	@echo " [mdu] CC -o $@"
-	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-
-	$(SIZECHECK)
-	$(CPTMP)
+	@$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
+	@$(SIZECHECK)
+	@$(CPTMP)
 
 install: all
-	@echo " [mdu] Installing..."
-	install -D mdu $(INSTALLDIR)/bin/mdu
-	$(STRIP) $(INSTALLDIR)/bin/mdu
-	chmod 0500 $(INSTALLDIR)/bin/mdu
+	@echo " [mdu] Installing as $(INSTALLDIR)/bin/mdu"
+	@install -D mdu $(INSTALLDIR)/bin/mdu
+	@$(STRIP) $(INSTALLDIR)/bin/mdu
+	@chmod 0500 $(INSTALLDIR)/bin/mdu
 
 clean:
 	rm -f mdu *.o .*.depend

release/src-rt-6.x.4708/router/mssl/Makefile

@@ -1,8 +1,8 @@
 include ../common.mak
 
 CFLAGS  = -Os -Wall $(EXTRACFLAGS) -fPIC -ffunction-sections -fdata-sections -Wsign-compare -I$(TOP)/shared
+LDFLAGS = -fPIC -ffunction-sections -fdata-sections -Wl,--gc-sections
 LIBS    =
-LDFLAGS	= -ffunction-sections -fdata-sections -Wl,--gc-sections
 
 ifneq ($(TCONFIG_HTTPS),)
  ifeq ($(TCONFIG_OPENSSL11),y)
@@ -20,45 +20,32 @@ endif
 ifneq ($(TCONFIG_BCMARM),y)
  LIBS   += -lpthread
 endif
-OBJ = mssl.o
 
 ifeq ($(TOMATO_EXPERIMENTAL),1)
  export CFLAGS += -DDEBUG_LOGMSG
 endif
 
-all: libmssl.so libmssl.a
+OBJS = mssl.o
 
-libmssl.so: $(OBJ)
+all: libmssl.so
+
+libmssl.so: $(OBJS)
 ifeq ($(TCONFIG_BCMARM),y)
-	$(LD) $(LIBS) -shared -o $@ $^
+	@echo " [mssl] LD $@"
+	@$(LD) $(LIBS) -shared -o $@ $^
 else
-	$(CC) -shared -o $@ $^ $(LDFLAGS) $(LIBS)
+	@echo " [mssl] CC $@"
+	@$(CC) $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) $(LIBS)
 endif
-	$(STRIP) $@
+	$(SIZECHECK)
+#	$(STRIP) $@
 	$(CPTMP)
 
-libmssl.a: $(OBJ)
-	rm -f $@
-	$(AR) cruv $@ $^
-
-clean:
-	rm -f .*.depend *.o *.so *.a
-
 install: all
-	@echo " [mssl] Installing..."
-	install -D libmssl.so $(INSTALLDIR)/usr/lib/libmssl.so
-ifneq ($(TCONFIG_BCMARM),y)
-	$(STRIP) $(INSTALLDIR)/usr/lib/libmssl.so
-endif
-
-%.o: %.c .%.depend
-	@echo " [mssl] CC $@"
-	@$(CC) $(CFLAGS) -c $<
+	@echo " [mssl] Installing as $(INSTALLDIR)/usr/lib/libmssl.so"
+	@install -D libmssl.so $(INSTALLDIR)/usr/lib/libmssl.so
+	@install -m 755 libmssl.so $(INSTALLDIR)/usr/lib
+	@$(STRIP) $(INSTALLDIR)/usr/lib/libmssl.so
 
-.depend: $(OBJS:%.o=%.c)
-	@$(CC) $(CFLAGS) -M $^ > .depend
-
-.%.depend: %.c
-	@$(CC) $(CFLAGS) -M $< > $@
-
--include $(OBJS:%.o=.%.depend)
+clean:
+	rm -f *.o *.so

release/src-rt-6.x.4708/router/nvram_arm/Makefile

@@ -20,38 +20,44 @@
 
 include ../common.mak
 
-CFLAGS	+= -I. -I$(SRCBASE)/include -Wall -fPIC
+CFLAGS  += -Wall $(EXTRACFLAGS) -fPIC -ffunction-sections -fdata-sections -Wsign-compare
 #CFLAGS += -g -DDEBUG
-CFLAGS	+= -s
-ifeq ($(CONFIG_TR_OPTIMIZE_SIZE),y)
-CFLAGS  += -Os
+CFLAGS  += -I$(TOP)/shared -I$(SRCBASE)/include -I.
+LDFLAGS += -L. -L$(TOP)/shared -lshared -fPIC -Wl,--gc-sections
+
+ifeq ($(TCONFIG_BCMARM),y)
+ CFLAGS += -O2 -s
 else
-CFLAGS  += -O2
+ CFLAGS += -Os
 endif
-LDFLAGS += -L. -L$(TOP)/shared -lshared
 
-CFLAGS += -I$(TOP)/shared
 ifeq ($(TCONFIG_BCMARM),y)
  CFLAGS  += -I$(SRCBASE)/shared/bcmwifi/include
  LDFLAGS += -lgcc_s
 endif
 
-
 vpath %.c $(SRCBASE)/shared/nvram
 
 all: libnvram.so nvram
 
-install: all
-	install -D libnvram.so $(INSTALLDIR)/usr/lib/libnvram.so
-	$(STRIP) $(INSTALLDIR)/usr/lib/libnvram.so
-	install -D nvram $(INSTALLDIR)/bin/nvram
-	$(STRIP) $(INSTALLDIR)/bin/nvram
-
-clean:
-	rm -f *.o *.a *.so nvram
-
 libnvram.so: nvram_linux.o
-	$(LD) -shared -o $@ $^
+	@echo " [nvram] LD $@"
+	@$(LD) -shared -o $@ $^
 
 nvram: main.o libnvram.so
-	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -lnvram
+	@echo " [nvram] CC $@"
+	@$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -lnvram
+	$(SIZECHECK)
+	$(CPTMP)
+
+install: all
+	@echo " [nvram] Installing as $(INSTALLDIR)/usr/lib/libnvram.so"
+	@install -D libnvram.so $(INSTALLDIR)/usr/lib/libnvram.so
+	@$(STRIP) $(INSTALLDIR)/usr/lib/libnvram.so
+	@echo " [nvram] Installing as $(INSTALLDIR)/bin/nvram"
+	@install -D nvram $(INSTALLDIR)/bin/nvram
+	@$(STRIP) $(INSTALLDIR)/bin/nvram
+	@chmod 0555 $(INSTALLDIR)/bin/nvram
+
+clean:
+	rm -f *.o *.so nvram

release/src-rt-6.x.4708/router/rc/Makefile

@@ -1,24 +1,23 @@
 include ../common.mak
 
-CFLAGS = -Wall -Os $(EXTRACFLAGS) -Wsign-compare
+CFLAGS = -Wall -Os $(EXTRACFLAGS) -ffunction-sections -fdata-sections -Wsign-compare
 CFLAGS += -I. -I$(TOP)/shared -I$(SRCBASE)/include -idirafter$(LINUXDIR)/include
-CFLAGS += -ffunction-sections -fdata-sections
+LDFLAGS = -ffunction-sections -fdata-sections -Wl,--gc-sections
 
 ifeq ($(TCONFIG_DPSTA),y)
  CFLAGS += -I$(TOP)/dpsta
 endif
 
 ifeq ($(TCONFIG_BCMARM),y)
-LDFLAGS = -L$(TOP)/nvram${BCMEX} -lnvram -L$(TOP)/shared -lshared -lcrypt -L$(TOP)/libbcmcrypto -lbcmcrypto
  CFLAGS  += -I$(SRCBASE)/shared/bcmwifi/include -DHAVE_TYPE_FLOAT
  CFLAGS  += -I$(SRCBASE)/common/include
+ LDFLAGS += -L$(TOP)/nvram${BCMEX} -lnvram -L$(TOP)/shared -lshared -lcrypt -L$(TOP)/libbcmcrypto -lbcmcrypto
  LDFLAGS += -L$(TOP)/libbcm -lbcm
  LDFLAGS += -lgcc_s
 else
-LDFLAGS = -L$(TOP)/nvram -lnvram -L$(TOP)/shared -lshared -lcrypt
+ LDFLAGS += -L$(TOP)/nvram -lnvram -L$(TOP)/shared -lshared -lcrypt
 endif
 
-LDFLAGS += -ffunction-sections -fdata-sections -Wl,--gc-sections
 ifeq ($(STATIC),1)
  LDFLAGS += -static
 endif
@@ -36,11 +35,9 @@ CFLAGS += -DDEBUG_LOGMSG
 endif
 
 OBJS := rc.o init.o interface.o network.o wan.o services.o dhcp.o \
-        firewall.o ppp.o telssh.o wnas.o \
-        listen.o redial.o led.o qos.o forward.o misc.o mtd.o \
-        buttons.o restrict.o gpio.o sched.o \
-        bwlimit.o arpbind.o \
-        tomatoanon.o
+        firewall.o ppp.o telssh.o wnas.o listen.o redial.o \
+        led.o qos.o forward.o misc.o mtd.o buttons.o restrict.o \
+        gpio.o sched.o bwlimit.o arpbind.o tomatoanon.o
 
 ifeq ($(or $(TCONFIG_BCMARM),$(TCONFIG_BLINK)),y)
  OBJS += blink.o
@@ -149,13 +146,12 @@ all: rc
 
 rc: $(OBJS)
 	@echo " [rc] CC $@"
-	@$(CC) -o $@ $^ $(LDFLAGS)
-
+	@$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
 	$(SIZECHECK)
 	$(CPTMP)
 
 install: all
-	@echo "[rc] Installing..."
+	@echo " [rc] Installing as $(INSTALLDIR)/sbin/rc"
 	@install -D rc $(INSTALLDIR)/sbin/rc
 	@$(STRIP) $(INSTALLDIR)/sbin/rc
 	@chmod 0500 $(INSTALLDIR)/sbin/rc
@@ -230,19 +226,11 @@ endif
 clean:
 	rm -f rc *.o .*.depend
 
-size: rc
-	mipsel-uclibc-nm --print-size --size-sort rc
-
 %.o: %.c .%.depend
 	@echo " [rc] CC $@"
-	@$(CC) $(CFLAGS) -c $<
+	@$(CC) $(CFLAGS) -o $@ -c $<
 
 .%.depend: %.c
 	@$(CC) $(CFLAGS) -M $< > $@
 
 -include $(OBJS:%.o=.%.depend)
-
-pswatch: pswatch.c
-	$(CC) -o $@ $^
-	$(STRIP) $@
-	$(CPTMP)

release/src-rt-6.x.4708/router/rstats/Makefile

@@ -3,39 +3,34 @@ include ../common.mak
 CFLAGS  = -Os -Wall $(EXTRACFLAGS) -Wsign-compare
 CFLAGS += -I$(SRCBASE)/include -I$(TOP)/shared -ffunction-sections -fdata-sections
 LDFLAGS = -ffunction-sections -fdata-sections -Wl,--gc-sections
-
-ifeq ($(TOMATO_EXPERIMENTAL),1)
-export CFLAGS += -DDEBUG_LOGMSG
-endif
+LIBS    =
 
 ifeq ($(TCONFIG_BCMARM),y)
  LIBS   += -lgcc_s
 endif
 
+ifeq ($(TOMATO_EXPERIMENTAL),1)
+ export CFLAGS += -DDEBUG_LOGMSG
+endif
+
 OBJS = rstats.o
 
 all: rstats
 
 rstats: $(OBJS)
 	@echo " [rstats] CC -o $@"
-ifeq ($(TCONFIG_BCMARM),y)
-	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) -L../nvram${BCMEX} -lnvram -L../shared -lshared $(LIBS)
-else
-	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) -L../nvram -lnvram -L../shared -lshared
-endif
-
+	@$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) -L../nvram${BCMEX} -lnvram -L../shared -lshared $(LIBS)
 	$(SIZECHECK)
 	$(CPTMP)
 
 clean:
-	rm -f rstats .*.depend
-	rm -f *.o
+	rm -f rstats *.o .*.depend
 
 install: all
-	@echo " [rstats] Installing..."
-	install -D rstats $(INSTALLDIR)/bin/rstats
-	$(STRIP) $(INSTALLDIR)/bin/rstats
-	chmod 0500 $(INSTALLDIR)/bin/rstats
+	@echo " [rstats] Installing as $(INSTALLDIR)/bin/rstats"
+	@install -D rstats $(INSTALLDIR)/bin/rstats
+	@$(STRIP) $(INSTALLDIR)/bin/rstats
+	@chmod 0500 $(INSTALLDIR)/bin/rstats
 
 %.o: %.c .%.depend
 	@echo " [rstats] CC $@"

release/src-rt-6.x.4708/router/shared/Makefile

@@ -1,17 +1,19 @@
 include ../common.mak
 
-CFLAGS = -Os -Wall $(EXTRACFLAGS) -ffunction-sections -fdata-sections -fPIC -Wsign-compare
-CFLAGS += -I$(TOP)/shared -I$(SRCBASE)/include
-CFLAGS += -I$(LINUXDIR)/include
+CFLAGS  = -Os -Wall $(EXTRACFLAGS) -fPIC -ffunction-sections -fdata-sections -Wsign-compare
+CFLAGS += -I$(TOP)/shared -I$(SRCBASE)/include -I$(LINUXDIR)/include
+LDFLAGS = -fPIC --gc-sections
+
+ifeq ($(TCONFIG_BCMWL6),y)
  CFLAGS += -DTRAFFIC_MGMT
+endif
 
 ifeq (2_6_36,$(LINUX_VERSION))
  CFLAGS += -DAUTOFW_PORT_DEPRECATED
 endif
 
 ifeq ($(TCONFIG_BCMWL6),y)
-CFLAGS += -I$(SRCBASE)/shared/bcmwifi/include
-CFLAGS += -I$(SRCBASE)/common/include
+ CFLAGS += -I$(SRCBASE)/shared/bcmwifi/include -I$(SRCBASE)/common/include
 else
  CFLAGS += -I$(SRCBASE)/shared
 endif
@@ -32,19 +34,24 @@ ifeq ($(TOMATO_EXPERIMENTAL),1)
  export CFLAGS += -DDEBUG_LOGMSG
 endif
 
-LDFLAGS = --gc-sections -fPIC
-
 OBJS = shutils.o wl.o wl_linux.o linux_timer.o defaults.o id.o misc.o \
-       led.o version.o base64.o files.o strings.o process.o nvparse.o
+       led.o version.o base64.o files.o strings.o process.o
+
+# RT-N+
+ifeq ($(or $(TCONFIG_BLINK),$(TCONFIG_BCMARM)),y)
+ OBJS += nvparse.o
+endif
 
 ifeq ($(TCONFIG_USB),y)
  OBJS += usb.o \
+        $(TOP)/busybox/util-linux/volume_id/linux_swap.o \
         $(TOP)/busybox/util-linux/volume_id/ext.o \
         $(TOP)/busybox/util-linux/volume_id/util2.o \
         $(TOP)/busybox/util-linux/volume_id/fat.o \
-        $(TOP)/busybox/util-linux/volume_id/ntfs.o \
-        $(TOP)/busybox/util-linux/volume_id/exfat.o \
-        $(TOP)/busybox/util-linux/volume_id/linux_swap.o
+        $(TOP)/busybox/util-linux/volume_id/ntfs.o
+ ifeq ($(TCONFIG_BCMARM),y)
+  OBJS + = $(TOP)/busybox/util-linux/volume_id/exfat.o
+ endif
  ifeq ($(TCONFIG_HFS),y)
   CFLAGS += -DHFS
   OBJS += $(TOP)/busybox/libbb/hash_md5_sha.o \
@@ -64,20 +71,14 @@ endif
 
 vpath %.c $(SRCBASE)/shared/ $(SRCBASE)/shared/bcmwifi/src $(WLAN_ComponentSrcDirs)
 
-all: libshared.so libshared.a
+all: libshared.so
 
 libshared.so: $(OBJS)
 	@echo " [shared] LD $@"
 	@$(LD) $(LDFLAGS) -shared -o $@ $^
-
 	$(SIZECHECK)
 	$(CPTMP)
 
-libshared.a: $(OBJS)
-	@echo " [shared] AR $@"
-	@rm -f $@
-	@$(AR) cruv $@ $^
-
 install: all
 	@echo " [shared] Installing as $(INSTALLDIR)/usr/lib/libshared.so"
 	@install -d $(INSTALLDIR)/usr/lib
@@ -85,16 +86,4 @@ install: all
 	@$(STRIP) $(INSTALLDIR)/usr/lib/libshared.so
 
 clean:
-	rm -f *.o *.so *.a .*.depend
-
-%.o: %.c .%.depend
-	@echo " [shared] CC $@"
-	@$(CC) $(CFLAGS) -o $@ -c $<
-
-.depend: $(OBJS:%.o=%.c)
-	@$(CC) $(CFLAGS) -M $^ > .depend
-
-.%.depend: %.c
-	@$(CC) $(CFLAGS) -M $< > $@
-
--include $(OBJS:%.o=.%.depend)
+	rm -f *.o *.so