shithub: jbig2

Download patch

ref: a6217b4a900b82dd6af3076e964382a402c0bfbf
parent: 816d22aedc4bf1bc5d629f3b94b801c2ccf14693
author: giles <giles@ded80894-8fb9-0310-811b-c03f3676ab4d>
date: Wed May 7 12:04:12 EDT 2003 

It turned out not to be feasible to share rules between our MSVC
makefile and the integration makefile in ghostscript, so remove it.
msvc.mak is returned to it's previous state except for some additions
made when common.mak was introduced.

(recommitted after repository became corrupt. original change dated Apr 16 18:10:01 2003)


git-svn-id: http://svn.ghostscript.com/jbig2dec/trunk@238 ded80894-8fb9-0310-811b-c03f3676ab4d


--- a/common.mak
+++ /dev/null
@@ -1,77 +1,0 @@
-# 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
-
--- a/msvc.mak
+++ b/msvc.mak
@@ -11,12 +11,79 @@
 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) \
+ jbig2_metadata$(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 jbig2_metadata.h \
+ config_win32.h sha1.h
+
 all: jbig2dec$(EXE)
 
-jbig2dec$(EXE): $(libjbig2_OBJS) $(jbig2dec_OBJS)
-	$(CC) $(CFLAGS) $(FE)jbig2dec$(EXE) $(libjbig2_OBJS) $(jbig2dec_OBJS) $(LIBPNGDIR)/libpng.lib $(ZLIBDIR)/zlib.lib
+jbig2dec$(EXE): $(OBJS)
+	$(CC) $(CFLAGS) $(FE)jbig2dec$(EXE) $(OBJS) $(LIBPNGDIR)/libpng.lib $(ZLIBDIR)/zlib.lib
 
-!include common.mak
+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
+
+jbig2_metadata$(OBJ): jbig2_metadata.c $(HDRS)
+	$(CC) $(CFLAGS) -c jbig2_metadata.c
+
+jbig2dec$(OBJ): jbig2dec.c $(HDRS)
+	$(CC) $(CFLAGS) -c jbig2dec.c
+
+sha1$(OBJ): sha1.c $(HDRS)
+	$(CC) $(CFLAGS) -c sha1.c
 
 clean:
 	-del $(OBJS)