head	1.2;
access;
symbols
	RELEASE_8_3_0:1.2
	RELEASE_9_0_0:1.2
	RELEASE_7_4_0:1.2
	RELEASE_8_2_0:1.2
	RELEASE_6_EOL:1.2
	RELEASE_8_1_0:1.2
	RELEASE_7_3_0:1.2
	RELEASE_8_0_0:1.2
	RELEASE_7_2_0:1.2
	RELEASE_7_1_0:1.1
	RELEASE_6_4_0:1.1
	RELEASE_5_EOL:1.1
	RELEASE_7_0_0:1.1
	RELEASE_6_3_0:1.1
	PRE_XORG_7:1.1
	RELEASE_4_EOL:1.1
	RELEASE_6_2_0:1.1
	RELEASE_6_1_0:1.1
	RELEASE_5_5_0:1.1
	RELEASE_6_0_0:1.1
	RELEASE_5_4_0:1.1
	RELEASE_4_11_0:1.1
	RELEASE_5_3_0:1.1
	RELEASE_4_10_0:1.1
	RELEASE_5_2_1:1.1
	RELEASE_5_2_0:1.1
	RELEASE_4_9_0:1.1
	RELEASE_5_1_0:1.1;
locks; strict;
comment	@# @;


1.2
date	2008.12.24.13.09.35;	author danfe;	state Exp;
branches;
next	1.1;

1.1
date	2003.05.09.19.03.17;	author fjoe;	state Exp;
branches;
next	;


desc
@@


1.2
log
@- Update to version 0.8
- Stop using GNU make(1)
- Install examples and more complete docs set
- Cleanup Makefile
- Drop maintainership
- Reflect project move to SourceForge
@
text
@--- makefile.orig	2008-07-26 04:10:14.000000000 +0700
+++ makefile	2008-07-26 04:08:44.000000000 +0700
@@@@ -43,25 +43,18 @@@@
 PPMZIPSRC = ./ppmzip
 PPMSRC = ./ppmdi
 
-CPP = g++
-CC = gcc
-LINK = g++
-
-CFLAGS = -O3 -c -w
-CPPFLAGS_XMILL = $(CFLAGS) -DXMILL -Izlib -Ibzlib -IXMill -Ippmdi
-CPPFLAGS_XDEMILL = $(CFLAGS) -Izlib -Ibzlib -DXDEMILL -Ippmdi
-CPPFLAGS_XMILLTEST = $(CFLAGS) -IXMill
-CPPFLAGS_PPMZIP = $(CFLAGS) -Ippmdi
+CPP = $(CXX)
+CC = $(CC)
+LINK = $(CPP)
+
+CPPFLAGS = $(CXXFLAGS) -c -w
+CPPFLAGS_XMILL = $(CPPFLAGS) -DXMILL -IXMill -Ippmdi
+CPPFLAGS_XDEMILL = $(CPPFLAGS) -DXDEMILL -Ippmdi
+CPPFLAGS_XMILLTEST = $(CPPFLAGS) -IXMill
+CPPFLAGS_PPMZIP = $(CPPFLAGS) -Ippmdi
 
 # LINK_FLAGS = -L.
 
-ZLIB_OBJS = $(TMP)/adler32.o $(TMP)/crc32.o $(TMP)/deflate.o $(TMP)/trees.o $(TMP)/uncompr.o \
-            $(TMP)/inffast.o $(TMP)/inflate.o $(TMP)/inftrees.o $(TMP)/infutil.o $(TMP)/infblock.o \
-            $(TMP)/infcodes.o $(TMP)/zutil.o
-
-BZLIB_OBJS= $(TMP)/blocksort.o $(TMP)/bzlib.o $(TMP)/compress_b.o $(TMP)/crctable.o $(TMP)/decompress.o \
-            $(TMP)/huffman.o $(TMP)/randtable.o
-
 XMILLLIB_MISC  =  \
 		   $(TMP)/CompressMan.o $(TMP)/ContMan.o $(TMP)/PathDict.o \
 		   $(TMP)/UnCompCont.o \
@@@@ -120,9 +113,9 @@@@
 XDEMILL_OBJSPART = $(TMP)/realmain_u.o $(TMP)/Options_u.o
 XMILLTEST_OBJSPART = $(TMP)/testset.o $(TMP)/xmilltest.o
 
-XMILLOBJS    = $(ZLIB_OBJS) $(XMILL_OBJSPART) $(XMILLLIB_OBJSPART) $(BZLIB_OBJS) $(PPMDI_OBJS)
-XDEMILLOBJS  = $(ZLIB_OBJS) $(XDEMILL_OBJSPART) $(XMILLLIB_OBJSPART) $(BZLIB_OBJS) $(PPMDI_OBJS)
-XMILLTESTOBJS  = $(ZLIB_OBJS) $(XMILLTEST_OBJSPART) $(XMILLLIB_OBJSPART) $(BZLIB_OBJS) $(PPMDI_OBJS)
+XMILLOBJS    = $(XMILL_OBJSPART) $(XMILLLIB_OBJSPART) $(PPMDI_OBJS)
+XDEMILLOBJS  = $(XDEMILL_OBJSPART) $(XMILLLIB_OBJSPART) $(PPMDI_OBJS)
+XMILLTESTOBJS  = $(XMILLTEST_OBJSPART) $(XMILLLIB_OBJSPART) $(PPMDI_OBJS)
 
 XMILLINSPECTOBJS = $(TMP)/containers.o $(TMP)/exprinfo.o \
 			$(TMP)/globals.o \
@@@@ -131,27 +124,27 @@@@
 			$(TMP)/lists.o \
 			$(TMP)/main.o \
 			$(TMP)/xmillinspect.o \
-			$(ZLIB_OBJS) $(XMILLLIB_OBJSPART) $(BZLIB_OBJS) \
-			$(PPMDI_OBJS)
+			$(XMILLLIB_OBJSPART) $(PPMDI_OBJS)
 
 XMILLEXAMPLEOBJS = $(TMP)/xmillexample.o \
-			$(ZLIB_OBJS) $(XMILLLIB_OBJSPART) $(BZLIB_OBJS) \
-			$(PPMDI_OBJS)
+			$(XMILLLIB_OBJSPART) $(PPMDI_OBJS)
 
 $(BIN)/xcmill : $(XMILLOBJS)
-	$(LINK) -o $(BIN)/xcmill $(LINK_FLAGS) $(XMILLOBJS)
+	$(LINK) -o $(BIN)/xcmill $(LINK_FLAGS) $(XMILLOBJS) -lz -lbz2
 
 $(BIN)/xdemill : $(XDEMILLOBJS)
-	$(LINK) -o $(BIN)/xdemill $(LINK_FLAGS) $(XDEMILLOBJS)
+	$(LINK) -o $(BIN)/xdemill $(LINK_FLAGS) $(XDEMILLOBJS) -lz -lbz2
 
 $(BIN)/xmilltest : $(XMILLTESTOBJS)
-	$(LINK) -o $(BIN)/xmilltest $(LINK_FLAGS) $(XMILLTESTOBJS)
+	$(LINK) -o $(BIN)/xmilltest $(LINK_FLAGS) $(XMILLTESTOBJS) -lz -lbz2
 
 $(BIN)/xmillexample : $(XMILLEXAMPLEOBJS)
-	$(LINK) -o $(BIN)/xmillexample $(LINK_FLAGS) $(XMILLEXAMPLEOBJS)
+	$(LINK) -o $(BIN)/xmillexample $(LINK_FLAGS) $(XMILLEXAMPLEOBJS) \
+		-lz -lbz2
 
 $(BIN)/xmillinspect : $(XMILLINSPECTOBJS)
-	$(LINK) -o $(BIN)/xmillinspect $(LINK_FLAGS) $(XMILLINSPECTOBJS)
+	$(LINK) -o $(BIN)/xmillinspect $(LINK_FLAGS) $(XMILLINSPECTOBJS) \
+		-lz -lbz2
 
 $(BIN)/ppmzip : $(PPMZIPOBJS)
 	$(LINK) -o $(BIN)/ppmzip $(LINK_FLAGS) $(PPMZIPOBJS)
@


1.1
log
@New port: xmill

An efficient compressor for XML.

Submitted by:	Alexey Dokuchaev
@
text
@d1 5
a5 5
--- makefile.orig	Mon Nov 29 16:37:20 1999
+++ makefile	Fri May  9 16:40:56 2003
@@@@ -33,21 +33,18 @@@@
 TMP = ./tmp
 SRC = ./src
d8 8
a15 2
-CPPFLAGS_XMILL = -O3 -c -Izlib -DXMILL
-CPPFLAGS_XDEMILL = -O3 -c -Izlib -DXDEMILL
d17 8
a24 2
+CPPFLAGS_XMILL = $(CXXFLAGS) -c -Izlib -DXMILL
+CPPFLAGS_XDEMILL = $(CXXFLAGS) -c -Izlib -DXDEMILL
a25 5
-CC = gcc
-CFLAGS = -O3 -c
+CC = $(CC)
+CFLAGS += -c
 LINK=g++
d31 1
a31 2
+ZLIB_LIBS = -lz
 
a33 54
+BZLIB_LIBS = -lbz2
 
 XMILL_OBJSPART  =  $(TMP)/CompressMan.o $(TMP)/ContMan.o $(TMP)/PathDict.o $(TMP)/PathTree.o \
                    $(TMP)/RepeatCompress.o $(TMP)/RunLenCompress.o $(TMP)/SAXClient.o \
@@@@ -61,11 +58,11 @@@@
                    $(TMP)/DivCompress_u.o $(TMP)/EnumCompress_u.o $(TMP)/Error_u.o \
                    $(TMP)/Options_u.o $(TMP)/MemStreamer_u.o
 
-XMILLOBJS    = $(ZLIB_OBJS)  $(XMILL_OBJSPART) $(TMP)/ZLib.o
-XBMILLOBJS   = $(BZLIB_OBJS) $(XMILL_OBJSPART) $(TMP)/ZLib_b.o
+XMILLOBJS    = $(XMILL_OBJSPART) $(TMP)/ZLib.o $(ZLIB_LIBS)
+XBMILLOBJS   = $(XMILL_OBJSPART) $(TMP)/ZLib_b.o $(BZLIB_LIBS)
 
-XDEMILLOBJS  = $(ZLIB_OBJS)  $(XDEMILL_OBJSPART) $(TMP)/ZLib_u.o
-XBDEMILLOBJS = $(BZLIB_OBJS) $(XDEMILL_OBJSPART) $(TMP)/ZLib_bu.o
+XDEMILLOBJS  = $(XDEMILL_OBJSPART) $(TMP)/ZLib_u.o $(ZLIB_LIBS)
+XBDEMILLOBJS = $(XDEMILL_OBJSPART) $(TMP)/ZLib_bu.o $(BZLIB_LIBS)
 
 $(BIN)/xmill : $(XMILLOBJS)
 	$(LINK) -o $(BIN)/xmill $(LINK_FLAGS) $(XMILLOBJS)
@@@@ -146,7 +143,7 @@@@
 	$(CPP) -o $*.o $(CPPFLAGS_XMILL) $(SRC)/ZLib.cpp
 
 $(TMP)/ZLib_b.o         : $(SRC)/ZLib.cpp
-	$(CPP) -o $*.o -I./bzlib $(CPPFLAGS_XMILL) -DUSE_BZIP $(SRC)/ZLib.cpp
+	$(CPP) -o $*.o $(CPPFLAGS_XMILL) -DUSE_BZIP $(SRC)/ZLib.cpp
 
 #********************************************************************
 
@@@@ -199,80 +196,7 @@@@
 	$(CPP) -o $*.o $(CPPFLAGS_XDEMILL) $(SRC)/ZLib.cpp
 
 $(TMP)/ZLib_bu.o          : $(SRC)/ZLib.cpp
-	$(CPP) -o $*.o -I./bzlib $(CPPFLAGS_XDEMILL) -DUSE_BZIP $(SRC)/ZLib.cpp
-
-#********************************************************************
-
-$(TMP)/adler32.o : ./zlib/adler32.c
-	$(CC) -o $*.o $(CFLAGS) ./zlib/adler32.c
-
-$(TMP)/crc32.o : ./zlib/crc32.c
-	$(CC) -o $*.o $(CFLAGS) ./zlib/crc32.c
-
-$(TMP)/compress.o : ./zlib/compress.c
-	$(CC) -o $*.o $(CFLAGS) ./zlib/compress.c
-
-$(TMP)/deflate.o : ./zlib/deflate.c
-	$(CC) -o $*.o $(CFLAGS) ./zlib/deflate.c
-
-$(TMP)/gzio.o : ./zlib/gzio.c
-	$(CC) -o $*.o $(CFLAGS) ./zlib/gzio.c
-
-$(TMP)/infblock.o : ./zlib/infblock.c
-	$(CC) -o $*.o $(CFLAGS) ./zlib/infblock.c
d35 50
a84 55
-$(TMP)/infcodes.o : ./zlib/infcodes.c
-	$(CC) -o $*.o $(CFLAGS) ./zlib/infcodes.c
-
-$(TMP)/inffast.o : ./zlib/inffast.c
-	$(CC) -o $*.o $(CFLAGS) ./zlib/inffast.c
-
-$(TMP)/inflate.o : ./zlib/inflate.c
-	$(CC) -o $*.o $(CFLAGS) ./zlib/inflate.c
-
-$(TMP)/inftrees.o : ./zlib/inftrees.c
-	$(CC) -o $*.o $(CFLAGS) ./zlib/inftrees.c
-
-$(TMP)/infutil.o : ./zlib/infutil.c
-	$(CC) -o $*.o $(CFLAGS) ./zlib/infutil.c
-
-$(TMP)/trees.o : ./zlib/trees.c
-	$(CC) -o $*.o $(CFLAGS) ./zlib/trees.c
-
-$(TMP)/uncompr.o : ./zlib/uncompr.c
-	$(CC) -o $*.o $(CFLAGS) ./zlib/uncompr.c
-
-$(TMP)/zutil.o : ./zlib/zutil.c
-	$(CC) -o $*.o $(CFLAGS) ./zlib/zutil.c
-
-$(TMP)/minigzip.o : ./zlib/minigzip.c
-	$(CC) -o $*.o $(CFLAGS) ./zlib/minigzip.c
-
-#********************************************************************
-
-$(TMP)/blocksort.o : ./bzlib/blocksort.c
-	$(CC) -o $*.o $(CFLAGS) ./bzlib/blocksort.c
-
-$(TMP)/compress_b.o : ./bzlib/compress.c
-	$(CC) -o $*.o $(CFLAGS) ./bzlib/compress.c
-
-$(TMP)/crctable.o : ./bzlib/crctable.c
-	$(CC) -o $*.o $(CFLAGS) ./bzlib/crctable.c
-
-$(TMP)/decompress.o : ./bzlib/decompress.c
-	$(CC) -o $*.o $(CFLAGS) ./bzlib/decompress.c
-
-$(TMP)/huffman.o : ./bzlib/huffman.c
-	$(CC) -o $*.o $(CFLAGS) ./bzlib/huffman.c
-
-$(TMP)/randtable.o : ./bzlib/randtable.c
-	$(CC) -o $*.o $(CFLAGS) ./bzlib/randtable.c
-
-$(TMP)/bzlib.o : ./bzlib/bzlib.c
-	$(CC) -o $*.o $(CFLAGS) ./bzlib/bzlib.c
-
-#$(TMP)/bzip2.o : ./bzlib/bzip2.c
-#	$(CC) -o $*.o $(CFLAGS) ./bzlib/bzip2.c
+	$(CPP) -o $*.o $(CPPFLAGS_XDEMILL) -DUSE_BZIP $(SRC)/ZLib.cpp
 
 #********************************************************************
d86 2
@

