From: Harald Welte <laforge@gnumonks.org>
Date: Mon, 26 Aug 2002 13:09:40 +0000 (+0000)
Subject: make NO_SHARED_LIBS work again (Roberto Nibali)
X-Git-Tag: v1.2.8-freeze~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a7116ec8070adfe2c17abf822e23c8875da164e;p=thirdparty%2Fiptables.git

make NO_SHARED_LIBS work again (Roberto Nibali)
---

diff --git a/Makefile b/Makefile
index a1d55216..953c0aa1 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ else
 DEPFILES = $(EXT_OBJS:%.o=%.d)
 STATIC_LIBS  = extensions/libext.a
 STATIC6_LIBS = extensions/libext6.a
-LDFLAGS      =
+LDFLAGS      = -static
 LDLIBS       =
 endif
 
@@ -115,21 +115,21 @@ ip6tables.o: ip6tables.c
 	$(CC) $(CFLAGS) -DIP6T_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $<
 
 ip6tables: ip6tables-standalone.c ip6tables.o $(STATIC6_LIBS) libiptc/libiptc.a
-	$(CC) $(CFLAGS) -DIP6T_LIB_DIR=\"$(IPT_LIBDIR)\" -rdynamic -o $@ $^ $(LDLIBS)
+	$(CC) $(CFLAGS) -DIP6T_LIB_DIR=\"$(IPT_LIBDIR)\" $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
 $(DESTDIR)$(BINDIR)/ip6tables: ip6tables
 	@[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR)
 	cp $< $@
 
 ip6tables-save: ip6tables-save.c ip6tables.o $(STATIC6_LIBS) libiptc/libiptc.a
-	$(CC) $(CFLAGS) -DIP6T_LIB_DIR=\"$(IPT_LIBDIR)\" -rdynamic -o $@ $^ $(LDLIBS)
+	$(CC) $(CFLAGS) -DIP6T_LIB_DIR=\"$(IPT_LIBDIR)\" $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
 $(DESTDIR)$(BINDIR)/ip6tables-save: ip6tables-save
 	@[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR)
 	cp $< $@
 
 ip6tables-restore: ip6tables-restore.c ip6tables.o $(STATIC6_LIBS) libiptc/libiptc.a
-	$(CC) $(CFLAGS) -DIP6T_LIB_DIR=\"$(IPT_LIBDIR)\" -rdynamic -o $@ $^ $(LDLIBS)
+	$(CC) $(CFLAGS) -DIP6T_LIB_DIR=\"$(IPT_LIBDIR)\" $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
 $(DESTDIR)$(BINDIR)/ip6tables-restore: ip6tables-restore
 	@[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR)
diff --git a/extensions/libipt_dscp_helper.c b/extensions/libipt_dscp_helper.c
index 742ac86a..0279670b 100644
--- a/extensions/libipt_dscp_helper.c
+++ b/extensions/libipt_dscp_helper.c
@@ -47,7 +47,7 @@ static struct ds_class
 
 
 
-unsigned int 
+static unsigned int 
 class_to_dscp(const char *name)
 {
 	int i;
@@ -64,7 +64,7 @@ class_to_dscp(const char *name)
 
 
 
-const char *
+static const char *
 dscp_to_name(unsigned int dscp)
 {
 	int i;