From 6c7ac2a946eeb7283d6cb29f8bae18ab5ab131c0 Mon Sep 17 00:00:00 2001
From: Bart De Schuymer <bdschuym@pandora.be>
Date: Sun, 19 Aug 2007 07:24:52 +0000
Subject: further cleanup

---
 Makefile | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index ed4bb39..11363ec 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,6 @@
-# Standard part of Makefile for topdir.
-TOPLEVEL_INCLUDED=YES
-
-ifndef KERNEL_DIR
-KERNEL_DIR=include/linux
-endif
-ARPTABLES_VERSION:=0.0.3
-OLD_ARPTABLES_VERSION:=0.0.2
+ARPTABLES_VERSION:=0.0.3-3
 
+KERNEL_DIR:=./
 # default paths
 PREFIX:=/usr/local
 LIBDIR:=$(PREFIX)/lib
@@ -14,10 +8,6 @@ BINDIR:=$(PREFIX)/sbin
 MANDIR:=$(PREFIX)/man
 DESTDIR:=
 
-
-# directory for new arptables releases
-RELEASE_DIR:=/tmp
-
 COPT_FLAGS:=-O2
 CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DARPTC_DEBUG
 
@@ -41,29 +31,31 @@ libarptc/libarptc.o: libarptc/libarptc.c libarptc/libarptc_incl.c
 arptables: arptables-standalone.o arptables.o libarptc/libarptc.o $(EXT_OBJS)
 	$(CC) $(CFLAGS) -o $@ $^
 
-$(MANDIR)/man8/arptables.8: arptables.8
-	mkdir -p $(DESTDIR)$(@D)
-	install -m 0644 -o root -g root $< $(DESTDIR)$@
+$(DESTDIR)$(MANDIR)/man8/arptables.8: arptables.8
+	mkdir -p $(@D)
+	install -m 0644 -o root -g root $< $@
 
-.PHONY: exec
-exec: arptables
+$(DESTDIR)$(BINDIR)/arptables: arptables
 	mkdir -p $(DESTDIR)$(BINDIR)
-	install -m 0755 -o root -g root $< $(DESTDIR)$(BINDIR)/arptables
+	install -m 0755 -o root -g root $< $@
 
 .PHONY: install
-install: $(MANDIR)/man8/arptables.8 exec
+install: $(DESTDIR)$(MANDIR)/man8/arptables.8 $(DESTDIR)$(BINDIR)/arptables
 
 .PHONY: clean
 clean:
 	rm -f arptables
-	rm -f *.o *.c~
-	rm -f extensions/*.o extensions/*.c~
-	rm -f libarptc/*.o libarptc/*.c~
+	rm -f *.o *~
+	rm -f extensions/*.o extensions/*~
+	rm -f libarptc/*.o libarptc/*~
+	rm -f include/*~ include/libarptc/*~
 
 DIR:=arptables-v$(ARPTABLES_VERSION)
+CVSDIRS:=CVS extensions/CVS libarptc/CVS include/CVS include/libarptc/CVS
 # This is used to make a new userspace release
 .PHONY: release
 release:
+	rm -rf $(CVSDIRS)
 	mkdir -p include/linux/netfilter_arp
 	install -m 0644 -o root -g root \
 		$(KERNEL_DIR)/include/linux/netfilter_arp.h include/linux/
-- 
cgit v1.2.3