Dependency fixes.

diff --git a/Makefile b/Makefile
index 640e5b8d2371804cd23f6914a87069c3f6218424..be2e7192a3e2bb91b326c7b8acf26ab6b9d7deb8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ TOPLEVEL_INCLUDED=YES
 ifndef KERNEL_DIR
 KERNEL_DIR=/usr/src/linux
 endif
-NETFILTER_VERSION:=1.0.1
+NETFILTER_VERSION:=1.1.0
 OLD_NETFILTER_VERSION:=1.0.0
 
 LIBDIR:=/usr/local/lib
@@ -14,9 +14,8 @@ MANDIR:=/usr/local/man
 COPT_FLAGS:=-O #-O2
 CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -Iinclude/ -I$(KERNEL_DIR)/include -DNETFILTER_VERSION=\"$(NETFILTER_VERSION)\" -g #-pg # -DNDEBUG
 
-DEPFILES := $(SHARED_LIBS:%.so=%.d)
+DEPFILES = $(SHARED_LIBS:%.so=%.d)
 SH_CFLAGS:=$(CFLAGS) -fPIC
-DEPFILES := $(SHARED_LIBS:%.so=%.d)
 
 EXTRAS+=iptables iptables.o #iptables-save iptables-restore
 EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/iptables $(DESTDIR)$(MANDIR)/man8/iptables.8 #$(DESTDIR)$(BINDIR)/iptables-save $(DESTDIR)$(BINDIR)/iptables-restore

diff --git a/Rules.make b/Rules.make
index 74de7c19daaa9141c0b213796fe91cf6c5275eaf..5573ba2c6054f3b286f94a4dd815991e52ef2ae6 100644 (file)
--- a/Rules.make
+++ b/Rules.make
@@ -13,11 +13,11 @@ TAGS:
 
 dep: $(DEPFILES) $(EXTRA_DEPENDS)
        @echo Dependencies will be generated on next make.
-       @rm -f $(DEPFILES) $(EXTRA_DEPENDS) .makefirst
+       rm -f $(DEPFILES) $(EXTRA_DEPENDS) .makefirst
 
 $(SHARED_LIBS:%.so=%.d): %.d: %.c
        @-$(CC) -M -MG $(CFLAGS) $< | \
-           sed -e 's@^.*\.o:@$*.d $*.o:@' > $@
+           sed -e 's@^.*\.o:@$*.d $*_sh.o:@' > $@
 
 $(SHARED_LIBS): %.so : %_sh.o
        $(LD) -shared -o $@ $<
@@ -29,5 +29,11 @@ $(SHARED_LIBS): %.so : %_sh.o
        @echo Making dependencies: please wait...
        @touch .makefirst
 
+# This is useful for when dependencies completely screwed
+%.h::
+       @echo Something wrong... deleting dependencies.
+       -rm -f $(DEPFILES) $(EXTRA_DEPENDS) .makefirst
+       @exit 1
+
 -include $(DEPFILES) $(EXTRA_DEPENDS)
 -include .makefirst