c2esp/c2esp-jbig.patch

48 lines
1.4 KiB
Diff
Raw Normal View History

2013-05-23 13:29:38 +00:00
diff -up c2esp26/Makefile.jbig c2esp26/Makefile
--- c2esp26/Makefile.jbig 2012-09-06 01:18:06.000000000 +0200
+++ c2esp26/Makefile 2013-05-09 15:49:53.845249368 +0200
@@ -42,8 +42,6 @@ PROGS=
DEVPROGS= myopldecode
SCRIPTS= c2esplog
FILTERS= c2esp c2espC command2esp
-LIBJBG = jbig.o jbig_ar.o
-LIBJBG85= jbig85.o jbig_ar.o
BINPROGS=
ESPDRVFILE = KodakESP_15.drv
CDRVFILE = KodakESP_C_05.drv
@@ -233,8 +231,8 @@ all-done:
@echo "Patent warning that used to be here no longer applies"
@echo
-c2esp: c2esp.o c2espcommon.o $(LIBJBG85)
- $(CC) $(CFLAGS) -o $@ c2esp.o c2espcommon.o $(LIBCUPSDRIVER) $(LIBCUPSIMAGE) $(LIBJBG85)
+c2esp: c2esp.o c2espcommon.o
+ $(CC) $(CFLAGS) -o $@ c2esp.o c2espcommon.o $(LIBCUPSDRIVER) $(LIBCUPSIMAGE) -ljbig85
c2espC: c2espC.o c2espcommon.o
$(CC) $(CFLAGS) -o $@ c2espC.o c2espcommon.o $(LIBCUPSDRIVER) $(LIBCUPSIMAGE) -lz
@@ -242,8 +240,8 @@ c2espC: c2espC.o c2espcommon.o
command2esp: command2esp.o c2espcommon.o
$(CC) $(CFLAGS) -o $@ command2esp.o c2espcommon.o $(LIBCUPSDRIVER)
-myopldecode: myopldecode.o $(LIBJBG)
- $(CC) $(CFLAGS) -o $@ $@.o $(LIBJBG) -lz
+myopldecode: myopldecode.o
+ $(CC) $(CFLAGS) -o $@ $@.o -ljbig -lz
#
# Installation rules
@@ -395,11 +393,8 @@ clean:
#
# Header dependencies
#
-jbig.o: jbig.h
-jbig85.o: jbig85.h
-c2esp.o: jbig85.h c2espcommon.h
+c2esp.o: c2espcommon.h
c2espC.o: c2espcommon.h
-myopldecode.o: jbig.h
command2esp.o: c2espcommon.h
c2espcommon.o: c2espcommon.h