rev 227 - trunk

Author: giles
Date: 2003-03-31 13:27:05 -0800 (Mon, 31 Mar 2003)
New Revision: 227

Added:
   trunk/common.mak
Modified:
   trunk/msvc.mak
Log:
Abstract common build rules to a separate makefile to facilitate building into ghostscript.
Someone should test that msvc.mak still works.

Ideally we'll make autogen.sh re-create common.mak at some point.


Modified: trunk/msvc.mak
==============================================================================
--- trunk/msvc.mak	(original)
+++ trunk/msvc.mak	Tue Apr  1 12:42:02 2003
@@ -1,82 +1,22 @@
 # makefile for jbig2dec
 # under Microsoft Visual C++
 
+LIBPNGDIR=../libpng
+ZLIBDIR=../zlib
+
 EXE=.exe
 OBJ=.obj
 NUL=
-CFLAGS=-nologo -W4 -Zi -DHAVE_STRING_H=1 -I../libpng -I../zlib
+CFLAGS=-nologo -W4 -Zi -DHAVE_STRING_H=1 -I$(LIBPNGDIR) -I$(ZLIBDIR)
 CC=cl
 FE=-Fe
 
-OBJS=getopt$(OBJ) getopt1$(OBJ) jbig2$(OBJ) jbig2_arith$(OBJ) \
- jbig2_arith_iaid$(OBJ) jbig2_arith_int$(OBJ) jbig2_generic$(OBJ) \
- jbig2_huffman$(OBJ) jbig2_image$(OBJ) jbig2_image_pbm$(OBJ) \
- jbig2_image_png$(OBJ) jbig2_mmr$(OBJ) jbig2_page$(OBJ) \
- jbig2_segment$(OBJ) jbig2_symbol_dict$(OBJ) jbig2_text$(OBJ) \
- jbig2dec$(OBJ) sha1$(OBJ)
-
-HDRS=getopt.h jbig2.h jbig2_arith.h jbig2_arith_iaid.h jbig2_arith_int.h \
- jbig2_generic.h jbig2_huffman.h jbig2_hufftab.h jbig2_image.h \
- jbig2_mmr.h jbig2_priv.h jbig2_symbol_dict.h config_win32.h sha1.h
-
 all: jbig2dec$(EXE)
 
-jbig2dec$(EXE): $(OBJS)
-	$(CC) $(CFLAGS) $(FE)jbig2dec$(EXE) $(OBJS) ../libpng/libpng.lib ../zlib/zlib.lib
-
-getopt$(OBJ): getopt.c getopt.h
-	$(CC) $(CFLAGS) -c getopt.c
-
-getopt1$(OBJ): getopt1.c getopt.h
-	$(CC) $(CFLAGS) -c getopt1.c
-
-jbig2$(OBJ): jbig2.c $(HDRS)
-	$(CC) $(CFLAGS) -c jbig2.c
-
-jbig2_arith$(OBJ): jbig2_arith.c $(HDRS)
-	$(CC) $(CFLAGS) -c jbig2_arith.c
-
-jbig2_arith_iaid$(OBJ): jbig2_arith_iaid.c $(HDRS)
-	$(CC) $(CFLAGS) -c jbig2_arith_iaid.c
-
-jbig2_arith_int$(OBJ): jbig2_arith_int.c $(HDRS)
-	$(CC) $(CFLAGS) -c jbig2_arith_int.c
-
-jbig2_generic$(OBJ): jbig2_generic.c $(HDRS)
-	$(CC) $(CFLAGS) -c jbig2_generic.c
-
-jbig2_huffman$(OBJ): jbig2_huffman.c $(HDRS)
-	$(CC) $(CFLAGS) -c jbig2_huffman.c
-
-jbig2_image$(OBJ): jbig2_image.c $(HDRS)
-	$(CC) $(CFLAGS) -c jbig2_image.c
-
-jbig2_image_pbm$(OBJ): jbig2_image_pbm.c $(HDRS)
-	$(CC) $(CFLAGS) -c jbig2_image_pbm.c
-
-jbig2_image_png$(OBJ): jbig2_image_png.c $(HDRS)
-	$(CC) $(CFLAGS) -c jbig2_image_png.c
-
-jbig2_mmr$(OBJ): jbig2_mmr.c $(HDRS)
-	$(CC) $(CFLAGS) -c jbig2_mmr.c
-
-jbig2_page$(OBJ): jbig2_page.c $(HDRS)
-	$(CC) $(CFLAGS) -c jbig2_page.c
-
-jbig2_segment$(OBJ): jbig2_segment.c $(HDRS)
-	$(CC) $(CFLAGS) -c jbig2_segment.c
-
-jbig2_symbol_dict$(OBJ): jbig2_symbol_dict.c $(HDRS)
-	$(CC) $(CFLAGS) -c jbig2_symbol_dict.c
-
-jbig2_text$(OBJ): jbig2_text.c $(HDRS)
-	$(CC) $(CFLAGS) -c jbig2_text.c
-
-jbig2dec$(OBJ): jbig2dec.c $(HDRS)
-	$(CC) $(CFLAGS) -c jbig2dec.c
+jbig2dec$(EXE): $(libjbig2_OBJS) $(jbig2dec_OBJS)
+	$(CC) $(CFLAGS) $(FE)jbig2dec$(EXE) $(libjbig2_OBJS) $(jbig2dec_OBJS) $(LIBPNGDIR)/libpng.lib $(ZLIBDIR)/zlib.lib
 
-sha1$(OBJ): sha1.c $(HDRS)
-	$(CC) $(CFLAGS) -c sha1.c
+!include common.mak
 
 clean:
 	-del $(OBJS)

Added: trunk/common.mak
==============================================================================
--- trunk/common.mak	(original)
+++ trunk/common.mak	Tue Apr  1 12:42:02 2003
@@ -0,0 +1,77 @@
+# common makefile for jbig2dec
+
+# assumes the following are defined:
+# CC, CFLAGS, OBJ 
+
+libjbig2_OBJS=jbig2$(OBJ) jbig2_arith$(OBJ) \
+ jbig2_arith_iaid$(OBJ) jbig2_arith_int$(OBJ) jbig2_generic$(OBJ) \
+ jbig2_huffman$(OBJ) jbig2_image$(OBJ) jbig2_image_pbm$(OBJ) \
+ jbig2_image_png$(OBJ) jbig2_mmr$(OBJ) jbig2_page$(OBJ) \
+ jbig2_segment$(OBJ) jbig2_symbol_dict$(OBJ) jbig2_text$(OBJ) \
+ jbig2_metadata$(OBJ)
+
+libjbig2_HDRS=jbig2.h jbig2_arith.h jbig2_arith_iaid.h jbig2_arith_int.h \
+ jbig2_generic.h jbig2_huffman.h jbig2_hufftab.h jbig2_image.h \
+ jbig2_mmr.h jbig2_priv.h jbig2_symbol_dict.h jbig2_metatdata.h \
+ config_win32.h
+
+jbig2dec_OBJS=getopt$(OBJ) getopt1$(OBJ) sha1$(OBJ)
+jbig2dec_HDRS=getopt.h sha1.h
+
+getopt$(OBJ): getopt.c getopt.h
+	$(CC) $(CFLAGS) -c getopt.c
+
+getopt1$(OBJ): getopt1.c getopt.h
+	$(CC) $(CFLAGS) -c getopt1.c
+
+jbig2$(OBJ): jbig2.c $(libjbig2_HDRS)
+	$(CC) $(CFLAGS) -c jbig2.c
+
+jbig2_arith$(OBJ): jbig2_arith.c $(libjbig2_HDRS)
+	$(CC) $(CFLAGS) -c jbig2_arith.c
+
+jbig2_arith_iaid$(OBJ): jbig2_arith_iaid.c $(libjbig2_HDRS)
+	$(CC) $(CFLAGS) -c jbig2_arith_iaid.c
+
+jbig2_arith_int$(OBJ): jbig2_arith_int.c $(libjbig2_HDRS)
+	$(CC) $(CFLAGS) -c jbig2_arith_int.c
+
+jbig2_generic$(OBJ): jbig2_generic.c $(libjbig2_HDRS)
+	$(CC) $(CFLAGS) -c jbig2_generic.c
+
+jbig2_huffman$(OBJ): jbig2_huffman.c $(libjbig2_HDRS)
+	$(CC) $(CFLAGS) -c jbig2_huffman.c
+
+jbig2_image$(OBJ): jbig2_image.c $(libjbig2_HDRS)
+	$(CC) $(CFLAGS) -c jbig2_image.c
+
+jbig2_image_pbm$(OBJ): jbig2_image_pbm.c $(libjbig2_HDRS)
+	$(CC) $(CFLAGS) -c jbig2_image_pbm.c
+
+jbig2_image_png$(OBJ): jbig2_image_png.c $(libjbig2_HDRS)
+	$(CC) $(CFLAGS) -c jbig2_image_png.c
+
+jbig2_mmr$(OBJ): jbig2_mmr.c $(libjbig2_HDRS)
+	$(CC) $(CFLAGS) -c jbig2_mmr.c
+
+jbig2_page$(OBJ): jbig2_page.c $(libjbig2_HDRS)
+	$(CC) $(CFLAGS) -c jbig2_page.c
+
+jbig2_segment$(OBJ): jbig2_segment.c $(libjbig2_HDRS)
+	$(CC) $(CFLAGS) -c jbig2_segment.c
+
+jbig2_symbol_dict$(OBJ): jbig2_symbol_dict.c $(libjbig2_HDRS)
+	$(CC) $(CFLAGS) -c jbig2_symbol_dict.c
+
+jbig2_text$(OBJ): jbig2_text.c $(libjbig2_HDRS)
+	$(CC) $(CFLAGS) -c jbig2_text.c
+
+jbig2_metadata$(OBJ) : jbig2_metadata.c $(libjbig2_HDRS)
+	$(CC) $(CFLAGS) -c jbig2_metadata.c
+
+jbig2dec$(OBJ): jbig2dec.c $(libjbig2_HDRS)
+	$(CC) $(CFLAGS) -c jbig2dec.c
+
+sha1$(OBJ): sha1.c $(libjbig2_HDRS)
+	$(CC) $(CFLAGS) -c sha1.c
+