Cleanups for release 3.0g.

1 files changed, 36 insertions, 13 deletions

diff --git a/xdelta3/Makefile b/xdelta3/Makefile
index 6cac09e..34437e9 100755
--- a/xdelta3/Makefile
+++ b/xdelta3/Makefile
@@ -1,8 +1,19 @@
-##
-PYTHON = python
-PYTGT = build/temp.linux-i686-2.3/xdelta3.so
-
-TARGETS = xdelta3 xdelta3-2 xdelta3-64 xdelta3-everything \
+# xdelta 3 - delta compression tools and library
+# Copyright (C) 2001, 2003, 2004, 2005, 2006.  Joshua P. MacDonald
+
+SOURCES = xdelta3-cfgs.h \
+          xdelta3-decode.h \
+          xdelta3-djw.h \
+          xdelta3-fgk.h \
+          xdelta3-list.h \
+          xdelta3-main.h \
+          xdelta3-python.h \
+          xdelta3-second.h \
+          xdelta3-test.h \
+          xdelta3.c \
+          xdelta3.h
+
+TARGETS = xdelta3 xdelta3-1 xdelta3-2 xdelta3-64 xdelta3-everything \
           xdelta3-Opg xdelta3-64-O xdelta3-Op xdelta3-O \
           xdelta3-decoder xdelta3-decoder-nomain.o \
           $(PYTGT) \
@@ -10,20 +21,23 @@ TARGETS = xdelta3 xdelta3-2 xdelta3-64 xdelta3-everything \
           xdelta3-noext xdelta3-tools xdelta3-tune \
           xdelta3-notools
 
-SOURCES = xdelta3.c xdelta3.h xdelta3-fgk.h xdelta3-djw.h xdelta3-list.h xdelta3-test.h \
-          xdelta3-main.h xdelta3-cfgs.h xdelta3-second.h xdelta3-python.h
+PYTHON = python
+PYTGT = build/temp.linux-i686-2.3/xdelta3.so
 
 PYFILES = xdelta3-regtest.py setup.py
 
-EXTRA = Makefile COPYING linkxd3lib.c badcopy.c www RELEASE.NOTES
+EXTRA = Makefile COPYING linkxd3lib.c badcopy.c www
 
-REL = 0f
+# $Format: "REL=$Xdelta3Version$" $
+REL=0g
 RELDIR = xdelta3$(REL)
 
-all: $(TARGETS)
+all: xdelta3
+
+all-targets: $(TARGETS)
 
 tar:
-        tar -czf /tmp/$(RELDIR)-tmp.tar.gz $(SOURCES) $(PYFILES) $(EXTRA)
+        tar --exclude ".svn" -czf /tmp/$(RELDIR)-tmp.tar.gz $(SOURCES) $(PYFILES) $(EXTRA)
         rm -rf /tmp/$(RELDIR)
         mkdir /tmp/$(RELDIR)
         (cd /tmp/$(RELDIR) && tar -xzf ../$(RELDIR)-tmp.tar.gz)
@@ -32,13 +46,22 @@ tar:
         rm -rf /tmp/$(RELDIR)
 
 clean:
-        rm -f $(TARGETS) xdtest.* core *.flc
+        rm -f $(TARGETS)
 
 $(PYTGT): $(SOURCES)
         $(PYTHON) setup.py install --compile --force
 
 xdelta3: $(SOURCES)
-        $(CC) -g -Wall -Wshadow xdelta3.c -o xdelta3 -DXD3_MAIN=1 -DGENERIC_ENCODE_TABLES=1 \
+        $(CC) -O3 -Wall -Wshadow xdelta3.c -lm -o xdelta3 \
+              -DXD3_DEBUG=0 \
+              -DXD3_USE_LARGEFILE64=1 \
+              -DREGRESSION_TEST=1 \
+              -DSECONDARY_DJW=1 \
+              -DXD3_MAIN=1 \
+              -DXD3_POSIX=1
+
+xdelta3-1: $(SOURCES)
+        $(CC) -g -Wall -Wshadow xdelta3.c -o xdelta3-1 -DXD3_MAIN=1 -DGENERIC_ENCODE_TABLES=1 \
                 -DXD3_USE_LARGEFILE64=1 -DREGRESSION_TEST=1 -DXD3_DEBUG=1 -DSECONDARY_DJW=1 -lm
 
 xdelta3-2: $(SOURCES)