From 198ebcd89c05ce2564770a4d445c48a2cd6846cf Mon Sep 17 00:00:00 2001 From: pedro Date: Sat, 2 Mar 2024 19:43:33 +0100 Subject: [PATCH] build: cstats/httpd/mdu/mssl/nvram/rstats/shared: some improvements to Makefile --- .../src-rt-6.x.4708/router/cstats/Makefile | 32 +++--- release/src-rt-6.x.4708/router/httpd/Makefile | 82 ++++++-------- release/src-rt-6.x.4708/router/mdu/Makefile | 51 +++++---- release/src-rt-6.x.4708/router/mssl/Makefile | 73 +++++------- .../src-rt-6.x.4708/router/nvram_arm/Makefile | 50 +++++---- release/src-rt-6.x.4708/router/rc/Makefile | 106 ++++++++---------- .../src-rt-6.x.4708/router/rstats/Makefile | 33 +++--- .../src-rt-6.x.4708/router/shared/Makefile | 85 ++++++-------- 8 files changed, 231 insertions(+), 281 deletions(-) diff --git a/release/src-rt-6.x.4708/router/cstats/Makefile b/release/src-rt-6.x.4708/router/cstats/Makefile index ba430cb24d..726eb0d3ff 100644 --- a/release/src-rt-6.x.4708/router/cstats/Makefile +++ b/release/src-rt-6.x.4708/router/cstats/Makefile @@ -1,15 +1,16 @@ 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 +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 +LIBS = -ifeq ($(TOMATO_EXPERIMENTAL),1) -export CFLAGS += -DDEBUG_LOGMSG +ifeq ($(TCONFIG_BCMARM),y) + LIBS += -lgcc_s endif -ifeq ($(TCONFIG_BCMARM),y) -LIBS += -lgcc_s +ifeq ($(TOMATO_EXPERIMENTAL),1) + export CFLAGS += -DDEBUG_LOGMSG endif OBJS = cstats.o @@ -18,23 +19,18 @@ 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 $@" diff --git a/release/src-rt-6.x.4708/router/httpd/Makefile b/release/src-rt-6.x.4708/router/httpd/Makefile index 203b9667e7..2cbd51381a 100644 --- a/release/src-rt-6.x.4708/router/httpd/Makefile +++ b/release/src-rt-6.x.4708/router/httpd/Makefile @@ -1,78 +1,74 @@ 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 -CFLAGS += -I$(SRCBASE)/common/include -LIBS += -lgcc_s + CFLAGS += -I$(SRCBASE)/shared/bcmwifi/include + 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 + 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 + OBJS += usb.o + OBJS += wwan.o endif ifeq ($(TCONFIG_NOCAT),y) -OBJS += nocat.o + OBJS += nocat.o endif 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 + OBJS += openvpn.o endif ifeq ($(TCONFIG_PPTPD),y) -OBJS += pptpd.o + OBJS += pptpd.o endif ifeq ($(TCONFIG_WIREGUARD),y) -OBJS += wireguard.o + OBJS += wireguard.o endif ifeq ($(TCONFIG_IPERF),y) -OBJS += iperf.o + OBJS += iperf.o endif 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 $< diff --git a/release/src-rt-6.x.4708/router/mdu/Makefile b/release/src-rt-6.x.4708/router/mdu/Makefile index 0442b18d97..2aa59a8a2b 100644 --- a/release/src-rt-6.x.4708/router/mdu/Makefile +++ b/release/src-rt-6.x.4708/router/mdu/Makefile @@ -1,32 +1,32 @@ include ../common.mak -CFLAGS = -Os -Wall $(EXTRACFLAGS) -Wsign-compare -CFLAGS += -I$(SRCBASE)/include -I$(TOP)/shared -LDFLAGS = -LIBS = -L$(TOP)/nvram${BCMEX} -lnvram -L$(TOP)/shared -lshared +CFLAGS = -Os -Wall $(EXTRACFLAGS) -ffunction-sections -fdata-sections -Wsign-compare +CFLAGS += -I$(SRCBASE)/include -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) -LIBS += -lgcc_s -endif - -ifeq ($(TOMATO_EXPERIMENTAL),1) -export CFLAGS += -DDEBUG_LOGMSG + LIBS += -lgcc_s endif ifneq ($(TCONFIG_HTTPS),) -CFLAGS += -I$(TOP)/$(OPENSSLDIR)/staged/usr/include -LIBS += -L$(TOP)/$(OPENSSLDIR)/staged/usr/lib -lssl -lcrypto -ifeq ($(TCONFIG_OPENSSL11),y) -LIBS += $(if $(TCONFIG_BCMARM),-lpthread,) -endif + CFLAGS += -I$(TOP)/$(OPENSSLDIR)/staged/usr/include + LIBS += -L$(TOP)/$(OPENSSLDIR)/staged/usr/lib -lssl -lcrypto + ifeq ($(TCONFIG_OPENSSL11),y) + LIBS += $(if $(TCONFIG_BCMARM),-lpthread,) + endif 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 + CFLAGS += -DUSE_LIBCURL -I$(TOP)/zlib/staged/usr/include -I$(TOP)/libcurl/staged/usr/include + 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 + CFLAGS += -I$(TOP)/mssl + LIBS += -L$(TOP)/mssl -lmssl +endif + +ifeq ($(TOMATO_EXPERIMENTAL),1) + export CFLAGS += -DDEBUG_LOGMSG endif OBJS = mdu.o @@ -35,16 +35,15 @@ 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 diff --git a/release/src-rt-6.x.4708/router/mssl/Makefile b/release/src-rt-6.x.4708/router/mssl/Makefile index b238b28270..675469c622 100644 --- a/release/src-rt-6.x.4708/router/mssl/Makefile +++ b/release/src-rt-6.x.4708/router/mssl/Makefile @@ -1,64 +1,51 @@ include ../common.mak -CFLAGS = -Os -Wall $(EXTRACFLAGS) -fPIC -ffunction-sections -fdata-sections -Wsign-compare -I$(TOP)/shared -LIBS = -LDFLAGS = -ffunction-sections -fdata-sections -Wl,--gc-sections +CFLAGS = -Os -Wall $(EXTRACFLAGS) -fPIC -ffunction-sections -fdata-sections -Wsign-compare -I$(TOP)/shared +LDFLAGS = -fPIC -ffunction-sections -fdata-sections -Wl,--gc-sections +LIBS = ifneq ($(TCONFIG_HTTPS),) -ifeq ($(TCONFIG_OPENSSL11),y) -CFLAGS += -I$(TOP)/openssl-1.1/include -DUSE_OPENSSL -DUSE_OPENSSL11 -LIBS += -L$(TOP)/openssl-1.1 -lssl -lcrypto + ifeq ($(TCONFIG_OPENSSL11),y) + CFLAGS += -I$(TOP)/openssl-1.1/include -DUSE_OPENSSL -DUSE_OPENSSL11 + LIBS += -L$(TOP)/openssl-1.1 -lssl -lcrypto + else + CFLAGS += -I$(TOP)/openssl/include -DUSE_OPENSSL + LIBS += -L$(TOP)/openssl -lssl -lcrypto + endif else -CFLAGS += -I$(TOP)/openssl/include -DUSE_OPENSSL -LIBS += -L$(TOP)/openssl -lssl -lcrypto -endif -else -CFLAGS += -I$(TOP)/cyassl/include -I$(TOP)/cyassl/ctaocrypt/include -LIBS += $(TOP)/cyassl/src/.libs/libcyassl.a + CFLAGS += -I$(TOP)/cyassl/include -I$(TOP)/cyassl/ctaocrypt/include + LIBS += $(TOP)/cyassl/src/.libs/libcyassl.a endif ifneq ($(TCONFIG_BCMARM),y) -LIBS += -lpthread + LIBS += -lpthread endif -OBJ = mssl.o ifeq ($(TOMATO_EXPERIMENTAL),1) -export CFLAGS += -DDEBUG_LOGMSG + 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 diff --git a/release/src-rt-6.x.4708/router/nvram_arm/Makefile b/release/src-rt-6.x.4708/router/nvram_arm/Makefile index ce35a6646c..95038188b9 100644 --- a/release/src-rt-6.x.4708/router/nvram_arm/Makefile +++ b/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 += -g -DDEBUG -CFLAGS += -s -ifeq ($(CONFIG_TR_OPTIMIZE_SIZE),y) -CFLAGS += -Os +CFLAGS += -Wall $(EXTRACFLAGS) -fPIC -ffunction-sections -fdata-sections -Wsign-compare +#CFLAGS += -g -DDEBUG +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 + 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 diff --git a/release/src-rt-6.x.4708/router/rc/Makefile b/release/src-rt-6.x.4708/router/rc/Makefile index 4aa672d420..8a673fc5d7 100644 --- a/release/src-rt-6.x.4708/router/rc/Makefile +++ b/release/src-rt-6.x.4708/router/rc/Makefile @@ -1,161 +1,157 @@ 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 + 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)/libbcm -lbcm -LDFLAGS += -lgcc_s + 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 + LDFLAGS += -static endif ifeq ($(TCONFIG_BCMARM),y) -LDFLAGS += $(EXTRA_LDFLAGS) + LDFLAGS += $(EXTRA_LDFLAGS) endif ifeq ($(TCONFIG_BCMSMP),y) -CFLAGS += -DSMP + CFLAGS += -DSMP endif ifeq ($(TOMATO_EXPERIMENTAL),1) -CFLAGS += -DDEBUG_LOGMSG + 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 -OBJS += blink_br.o + OBJS += blink.o + OBJS += blink_br.o endif ifeq ($(TCONFIG_ROAM),y) -OBJS += roamast.o + OBJS += roamast.o endif ifeq ($(TCONFIG_BCMARM),y) -OBJS += bcmutils.o + OBJS += bcmutils.o endif ifeq ($(TCONFIG_BCMWL6),y) -OBJS += arpreq.o + OBJS += arpreq.o endif ifeq ($(TCONFIG_FANCTRL),y) -OBJS += phy_tempsense.o + OBJS += phy_tempsense.o endif # dualwan / multiwan OBJS += mwan.o pbr.o ifeq ($(TCONFIG_USB),y) -OBJS += usb.o + OBJS += usb.o endif ifeq ($(TCONFIG_DDNS),y) -OBJS += ddns.o + OBJS += ddns.o endif ifeq ($(TCONFIG_CIFS),y) -OBJS += cifs.o + OBJS += cifs.o endif ifeq ($(TCONFIG_JFFS2),y) -OBJS += jffs2.o + OBJS += jffs2.o endif ifeq ($(TCONFIG_SAMBASRV),y) -OBJS += samba.o + OBJS += samba.o endif ifeq ($(TCONFIG_FTP),y) -OBJS += ftpd.o + OBJS += ftpd.o endif ifeq ($(TCONFIG_OPENVPN),y) -OBJS += openvpn.o + OBJS += openvpn.o endif ifeq ($(TCONFIG_WIREGUARD),y) -OBJS += wireguard.o -OBJS += curve25519.o + OBJS += wireguard.o + OBJS += curve25519.o endif ifeq ($(TCONFIG_TINC),y) -OBJS += tinc.o + OBJS += tinc.o endif ifeq ($(TCONFIG_PPTPD),y) -OBJS += pptpd.o -OBJS += pptp_client.o + OBJS += pptpd.o + OBJS += pptp_client.o endif ifeq ($(TCONFIG_NOCAT),y) -OBJS += nocat.o + OBJS += nocat.o endif ifeq ($(TCONFIG_NGINX),y) -OBJS += nginx.o -OBJS += mysql.o + OBJS += nginx.o + OBJS += mysql.o endif ifeq ($(TCONFIG_BT),y) -OBJS += transmission.o + OBJS += transmission.o endif ifeq ($(TCONFIG_NFS),y) -OBJS += nfs.o + OBJS += nfs.o endif ifeq ($(TCONFIG_SNMP),y) -OBJS += snmp.o + OBJS += snmp.o endif ifeq ($(TCONFIG_SDHC),y) -OBJS += mmc.o + OBJS += mmc.o endif ifeq ($(TCONFIG_UPS),y) -OBJS += ups.o + OBJS += ups.o endif ifeq ($(TCONFIG_TOR),y) -OBJS += tor.o + OBJS += tor.o endif ifeq ($(TCONFIG_BCMARM),y) -vpath %.c $(SRCBASE)/shared + vpath %.c $(SRCBASE)/shared endif 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) diff --git a/release/src-rt-6.x.4708/router/rstats/Makefile b/release/src-rt-6.x.4708/router/rstats/Makefile index 6a71ea2f81..8fbc15d641 100644 --- a/release/src-rt-6.x.4708/router/rstats/Makefile +++ b/release/src-rt-6.x.4708/router/rstats/Makefile @@ -1,15 +1,16 @@ 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 +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 +LIBS = -ifeq ($(TOMATO_EXPERIMENTAL),1) -export CFLAGS += -DDEBUG_LOGMSG +ifeq ($(TCONFIG_BCMARM),y) + LIBS += -lgcc_s endif -ifeq ($(TCONFIG_BCMARM),y) -LIBS += -lgcc_s +ifeq ($(TOMATO_EXPERIMENTAL),1) + export CFLAGS += -DDEBUG_LOGMSG endif OBJS = rstats.o @@ -18,24 +19,18 @@ 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 $@" diff --git a/release/src-rt-6.x.4708/router/shared/Makefile b/release/src-rt-6.x.4708/router/shared/Makefile index 939578685f..28efadd601 100644 --- a/release/src-rt-6.x.4708/router/shared/Makefile +++ b/release/src-rt-6.x.4708/router/shared/Makefile @@ -1,83 +1,84 @@ 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 += -DTRAFFIC_MGMT +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 + 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 + CFLAGS += -I$(SRCBASE)/shared endif ifeq ($(TCONFIG_BCMSMP),y) -CFLAGS += -DSMP + CFLAGS += -DSMP endif ifeq ($(TCONFIG_DHDAP),y) -export CFLAGS += -D__CONFIG_DHDAP__ + export CFLAGS += -D__CONFIG_DHDAP__ endif ifeq ($(TCONFIG_BCMBSD),y) -export CFLAGS += -DBCM_BSD + export CFLAGS += -DBCM_BSD endif ifeq ($(TOMATO_EXPERIMENTAL),1) -export CFLAGS += -DDEBUG_LOGMSG + 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 \ + 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 -ifeq ($(TCONFIG_HFS),y) -CFLAGS += -DHFS -OBJS += $(TOP)/busybox/libbb/hash_md5_sha.o \ - $(TOP)/busybox/libbb/bb_bswap_64.o \ - $(TOP)/busybox/util-linux/volume_id/hfs.o -endif + $(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 \ + $(TOP)/busybox/libbb/bb_bswap_64.o \ + $(TOP)/busybox/util-linux/volume_id/hfs.o + endif endif ifeq ($(CONFIG_BCMWL5),y) -OBJS += wlif_utils.o UdpLib.o bcmutils.o -OBJS += bcmwifi_channels.o + OBJS += wlif_utils.o UdpLib.o bcmutils.o + OBJS += bcmwifi_channels.o endif ifeq ($(TCONFIG_BCM7),y) -OBJS += et_linux.o bcmwifi_channels.o + OBJS += et_linux.o bcmwifi_channels.o 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