diff options
| author | rusty <rusty> | 2000-05-02 16:42:09 +0000 |
|---|---|---|
| committer | rusty <rusty> | 2000-05-02 16:42:09 +0000 |
| commit | bf0024dfe898331ec4387ebe15bc968383663d01 (patch) | |
| tree | 0d18b06ece28cb63ca96d9e4c0c839aca429d5e9 | |
| parent | 5a0293d506a055c3d7e806d9995be55adeeb0901 (diff) | |
Dependency fixes.
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | Rules.make | 10 |
2 files changed, 10 insertions, 5 deletions
@@ -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 @@ -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 |