375 lines
10 KiB
Text
375 lines
10 KiB
Text
Index: Makefile
|
|
--- Makefile.orig
|
|
+++ Makefile
|
|
@@ -16,11 +16,6 @@ SYSNAME := $(shell uname -n)
|
|
# No version number yet...
|
|
VERSION=0.0
|
|
|
|
-# Installation prefix...
|
|
-PREFIX=/usr/local
|
|
-PREFIX=/usr
|
|
-PREFIX=$(DESTDIR)/usr
|
|
-
|
|
# Pathnames for this package...
|
|
BIN=$(PREFIX)/bin
|
|
SHAREZJS=$(PREFIX)/share/foo2zjs
|
|
@@ -33,13 +28,13 @@ SHARESLX=$(PREFIX)/share/foo2slx
|
|
SHAREHC=$(PREFIX)/share/foo2hiperc
|
|
SHAREHBPL=$(PREFIX)/share/foo2hbpl
|
|
SHAREDDST=$(PREFIX)/share/foo2ddst
|
|
-MANDIR=$(PREFIX)/share/man
|
|
+MANDIR=$(PREFIX)/man
|
|
DOCDIR=$(PREFIX)/share/doc/foo2zjs/
|
|
INSTALL=install
|
|
ROOT=root
|
|
|
|
# Pathnames for referenced packages...
|
|
-FOODB=$(DESTDIR)/usr/share/foomatic/db/source
|
|
+FOODB=$(PREFIX)/share/foomatic/db/source
|
|
|
|
# User ID's
|
|
LPuid=-oroot
|
|
@@ -128,10 +123,6 @@ FILES = \
|
|
Makefile \
|
|
foo2zjs.c \
|
|
foo2zjs.1in \
|
|
- jbig.c \
|
|
- jbig.h \
|
|
- jbig_ar.c \
|
|
- jbig_ar.h \
|
|
zjsdecode.c \
|
|
zjsdecode.1in \
|
|
zjs.h \
|
|
@@ -253,9 +244,9 @@ FILES = \
|
|
$(NULL)
|
|
|
|
# CUPS vars
|
|
-CUPS_SERVERBIN := $(DESTDIR)$(shell cups-config --serverbin 2>/dev/null)
|
|
-CUPS_DEVEL := $(shell grep cupsSideChannelDoRequest /usr/include/cups/sidechannel.h 2>/dev/null)
|
|
-CUPS_GOODAPI := $(shell cups-config --api-version 2>/dev/null | sed "s/1\.[0123].*//")
|
|
+CUPS_SERVERBIN := 1
|
|
+CUPS_DEVEL := 1
|
|
+CUPS_GOODAPI := 1
|
|
|
|
# hpclj2600n-0.icm km2430_0.icm km2430_1.icm km2430_2.icm samclp300-0.icm
|
|
# sihp1000.img sihp1005.img sihp1020.img sihp1018.img
|
|
@@ -296,7 +287,7 @@ MANPAGES+= foo2ddst-wrapper.1 foo2ddst.1 ddstdecode.1
|
|
MANPAGES+= gipddecode.1
|
|
MANPAGES+= foo2zjs-pstops.1 arm2hpdl.1 usb_printerid.1
|
|
MANPAGES+= printer-profile.1
|
|
-LIBJBG = jbig.o jbig_ar.o
|
|
+LIBJBG = -L${LOCALBASE}/lib -ljbig
|
|
BINPROGS=
|
|
|
|
ifeq ($(UNAME),Linux)
|
|
@@ -305,7 +296,7 @@ endif
|
|
|
|
# Compiler flags
|
|
#CFLAGS += -O2 -Wall -Wno-unused-but-set-variable
|
|
-CFLAGS += -O2 -Wall
|
|
+#CFLAGS += -O2 -Wall
|
|
#CFLAGS += -g
|
|
|
|
#
|
|
@@ -447,16 +438,6 @@ all-test:
|
|
echo " ***"; \
|
|
exit 1; \
|
|
fi
|
|
- @if ! dc -V >/dev/null 2>&1; then \
|
|
- echo " ***"; \
|
|
- echo " *** Error: must install GNU dc with the -e option!"; \
|
|
- echo " ***"; \
|
|
- echo " *** Install dc/bc package"; \
|
|
- echo " ***"; \
|
|
- echo " *** sudo dnf install bc OR sudo apt-get install dc"; \
|
|
- echo " ***"; \
|
|
- exit 1; \
|
|
- fi
|
|
ifeq ($(UNAME),Darwin)
|
|
@if ! type gsed >/dev/null 2>&1; then \
|
|
echo " ***"; \
|
|
@@ -482,34 +463,34 @@ all-done:
|
|
@echo "yourself."
|
|
|
|
|
|
-foo2ddst: foo2ddst.o $(LIBJBG)
|
|
+foo2ddst: foo2ddst.o
|
|
$(CC) $(CFLAGS) -o $@ foo2ddst.o $(LIBJBG)
|
|
|
|
-foo2hbpl2: foo2hbpl2.o $(LIBJBG)
|
|
+foo2hbpl2: foo2hbpl2.o
|
|
$(CC) $(CFLAGS) -o $@ foo2hbpl2.o $(LIBJBG)
|
|
|
|
-foo2hp: foo2hp.o $(LIBJBG)
|
|
+foo2hp: foo2hp.o
|
|
$(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG)
|
|
|
|
-foo2hiperc: foo2hiperc.o $(LIBJBG)
|
|
+foo2hiperc: foo2hiperc.o
|
|
$(CC) $(CFLAGS) -o $@ foo2hiperc.o $(LIBJBG)
|
|
|
|
-foo2lava: foo2lava.o $(LIBJBG)
|
|
+foo2lava: foo2lava.o
|
|
$(CC) $(CFLAGS) -o $@ foo2lava.o $(LIBJBG)
|
|
|
|
-foo2oak: foo2oak.o $(LIBJBG)
|
|
+foo2oak: foo2oak.o
|
|
$(CC) $(CFLAGS) -o $@ foo2oak.o $(LIBJBG)
|
|
|
|
-foo2qpdl: foo2qpdl.o $(LIBJBG)
|
|
+foo2qpdl: foo2qpdl.o
|
|
$(CC) $(CFLAGS) -o $@ foo2qpdl.o $(LIBJBG)
|
|
|
|
-foo2slx: foo2slx.o $(LIBJBG)
|
|
+foo2slx: foo2slx.o
|
|
$(CC) $(CFLAGS) -o $@ foo2slx.o $(LIBJBG)
|
|
|
|
-foo2xqx: foo2xqx.o $(LIBJBG)
|
|
+foo2xqx: foo2xqx.o
|
|
$(CC) $(CFLAGS) -o $@ foo2xqx.o $(LIBJBG)
|
|
|
|
-foo2zjs: foo2zjs.o $(LIBJBG)
|
|
+foo2zjs: foo2zjs.o
|
|
$(CC) $(CFLAGS) -o $@ foo2zjs.o $(LIBJBG)
|
|
|
|
|
|
@@ -595,47 +576,47 @@ ifeq ($(UNAME),Darwin)
|
|
cd osx-hotplug; $(MAKE) all
|
|
endif
|
|
|
|
-ok: ok.o $(LIBJBG)
|
|
+ok: ok.o
|
|
$(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@
|
|
|
|
-ddstdecode: ddstdecode.o $(LIBJBG)
|
|
+ddstdecode: ddstdecode.o
|
|
$(CC) $(CFLAGS) ddstdecode.o $(LIBJBG) -o $@
|
|
|
|
-gipddecode: gipddecode.o $(LIBJBG)
|
|
+gipddecode: gipddecode.o
|
|
$(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@
|
|
|
|
-hbpldecode: hbpldecode.o $(LIBJBG)
|
|
+hbpldecode: hbpldecode.o
|
|
$(CC) $(CFLAGS) hbpldecode.o $(LIBJBG) -o $@
|
|
|
|
-hipercdecode: hipercdecode.o $(LIBJBG)
|
|
+hipercdecode: hipercdecode.o
|
|
$(CC) $(CFLAGS) hipercdecode.o $(LIBJBG) -o $@
|
|
|
|
-lavadecode: lavadecode.o $(LIBJBG)
|
|
+lavadecode: lavadecode.o
|
|
$(CC) $(CFLAGS) lavadecode.o $(LIBJBG) -o $@
|
|
|
|
-oakdecode: oakdecode.o $(LIBJBG)
|
|
+oakdecode: oakdecode.o
|
|
$(CC) $(CFLAGS) -g oakdecode.o $(LIBJBG) -o $@
|
|
|
|
-opldecode: opldecode.o $(LIBJBG)
|
|
+opldecode: opldecode.o
|
|
$(CC) $(CFLAGS) -g opldecode.o $(LIBJBG) -o $@
|
|
|
|
-qpdldecode: qpdldecode.o $(LIBJBG)
|
|
+qpdldecode: qpdldecode.o
|
|
$(CC) $(CFLAGS) qpdldecode.o $(LIBJBG) -o $@
|
|
|
|
-splcdecode: splcdecode.o $(LIBJBG)
|
|
+splcdecode: splcdecode.o
|
|
$(CC) $(CFLAGS) splcdecode.o $(LIBJBG) -lz -o $@
|
|
|
|
-slxdecode: slxdecode.o $(LIBJBG)
|
|
+slxdecode: slxdecode.o
|
|
$(CC) $(CFLAGS) slxdecode.o $(LIBJBG) -o $@
|
|
|
|
-xqxdecode: xqxdecode.o $(LIBJBG)
|
|
+xqxdecode: xqxdecode.o
|
|
$(CC) $(CFLAGS) xqxdecode.o $(LIBJBG) -o $@
|
|
|
|
-zjsdecode: zjsdecode.o $(LIBJBG)
|
|
+zjsdecode: zjsdecode.o
|
|
$(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@
|
|
|
|
command2foo2lava-pjl: command2foo2lava-pjl.o
|
|
- $(CC) $(CFLAGS) -L/usr/local/lib command2foo2lava-pjl.o -lcups -o $@
|
|
+ $(CC) $(CFLAGS) -L/usr/local/lib command2foo2lava-pjl.o -pthread -lcups -o $@
|
|
|
|
command2foo2lava-pjl.o: command2foo2lava-pjl.c
|
|
$(CC) $(CFLAGS) -I/usr/local/include -c command2foo2lava-pjl.c
|
|
@@ -643,9 +624,8 @@ command2foo2lava-pjl.o: command2foo2lava-pjl.c
|
|
#
|
|
# Installation rules
|
|
#
|
|
-install: all install-test install-prog install-icc2ps install-osx-hotplug \
|
|
+install: all install-prog install-icc2ps install-osx-hotplug \
|
|
install-extra install-crd install-foo install-ppd \
|
|
- install-gui install-desktop install-filter \
|
|
install-man install-doc install-aa
|
|
#
|
|
# If you use CUPS, then restart the spooler:
|
|
@@ -706,11 +686,6 @@ install-prog:
|
|
$(INSTALL) -d $(SHAREZJS)/
|
|
$(INSTALL) -c -m 644 gamma.ps $(SHAREZJS)/
|
|
$(INSTALL) -c -m 644 gamma-lookup.ps $(SHAREZJS)/
|
|
- $(INSTALL) -d $(SHAREOAK)/
|
|
- $(INSTALL) -d $(SHAREHP)/
|
|
- $(INSTALL) -d $(SHAREXQX)/
|
|
- $(INSTALL) -d $(SHARELAVA)/
|
|
- $(INSTALL) -d $(SHAREHC)/
|
|
|
|
install-foo:
|
|
#
|
|
@@ -729,24 +704,14 @@ install-foo:
|
|
#
|
|
# Install current database files
|
|
#
|
|
- @if [ -d $(FOODB) ]; then \
|
|
+ echo install -d $(FOODB)
|
|
+ $(INSTALL) -d $(FOODB)
|
|
for dir in driver printer opt; do \
|
|
echo install -d $(FOODB)/$$dir/; \
|
|
$(INSTALL) -d $(FOODB)/$$dir/; \
|
|
echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
|
|
$(INSTALL) -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
|
|
done \
|
|
- else \
|
|
- echo "***"; \
|
|
- echo "*** WARNING! You don't have directory $(FOODB)/"; \
|
|
- echo "*** If you want support for foomatic printer configuration,";\
|
|
- echo "*** then you will have to manually install these files..."; \
|
|
- echo "***"; \
|
|
- ls foomatic-db/*/*.xml | sed 's/^/ /'; \
|
|
- echo "***"; \
|
|
- echo "*** ... wherever foomatic is stashed on your machine."; \
|
|
- echo "***"; \
|
|
- fi
|
|
#
|
|
# Clear foomatic cache and rebuild database if needed
|
|
#
|
|
@@ -890,7 +855,7 @@ install-extra:
|
|
done
|
|
|
|
MODEL=$(PREFIX)/share/cups/model
|
|
-LOCALMODEL=$(DESTDIR)/usr/local/share/cups/model
|
|
+LOCALMODEL=$(PREFIX)/share/foomatic/db/source/PPD/foo2zjs
|
|
MACMODEL=/Library/Printers/PPDs/Contents/Resources
|
|
PPD=$(PREFIX)/share/ppd
|
|
VARPPD=/var/lp/ppd
|
|
@@ -898,44 +863,8 @@ install-ppd:
|
|
#
|
|
# Install PPD files for CUPS
|
|
#
|
|
- export PATH=$$PATH:`pwd`:; \
|
|
- if [ -x /usr/sbin/ppdmgr -a -s $(VARPPD)/ppdcache ]; then \
|
|
- $(INSTALL) $(LPgid) -d $(VARPPD)/user; \
|
|
- cd PPD; \
|
|
- for ppd in *.ppd; do \
|
|
- manuf=`echo "$$ppd" | sed 's/-.*//'`; \
|
|
- $(INSTALL) $(LPgid) -d $(VARPPD)/user/$$manuf; \
|
|
- modify-ppd <$$ppd | gzip > $(VARPPD)/user/$$manuf/$$ppd.gz; \
|
|
- chmod 664 $(VARPPD)/user/$$manuf/$$ppd.gz; \
|
|
- done; \
|
|
- ppdmgr -u; \
|
|
- elif [ -d $(PPD) ]; then \
|
|
- find $(PPD) -name '*foo2zjs*' | xargs rm -rf; \
|
|
- find $(PPD) -name '*foo2hp*' | xargs rm -rf; \
|
|
- find $(PPD) -name '*foo2xqx*' | xargs rm -rf; \
|
|
- find $(PPD) -name '*foo2lava*' | xargs rm -rf; \
|
|
- find $(PPD) -name '*foo2qpdl*' | xargs rm -rf; \
|
|
- find $(PPD) -name '*foo2slx*' | xargs rm -rf; \
|
|
- find $(PPD) -name '*foo2hiperc*' | xargs rm -rf; \
|
|
- find $(PPD) -name '*foo2hbpl*' | xargs rm -rf; \
|
|
- find $(PPD) -name '*foo2ddst*' | xargs rm -rf; \
|
|
- [ -d $(PPD)/foo2zjs ] || mkdir $(PPD)/foo2zjs; \
|
|
- cd PPD; \
|
|
- for ppd in *.ppd; do \
|
|
- modify-ppd <$$ppd | gzip > $(PPD)/foo2zjs/$$ppd.gz; \
|
|
- chmod 664 $(PPD)/foo2zjs/$$ppd.gz; \
|
|
- done; \
|
|
- fi
|
|
- #
|
|
- export PATH=$$PATH:`pwd`:; \
|
|
- if [ -d $(MODEL) ]; then \
|
|
- rm -f $(MODEL)/KonicaMinolta*; \
|
|
- cd PPD; \
|
|
- for ppd in *.ppd; do \
|
|
- modify-ppd <$$ppd | gzip > $(MODEL)/$$ppd.gz; \
|
|
- chmod 664 $(MODEL)/$$ppd.gz; \
|
|
- done; \
|
|
- elif [ -d $(LOCALMODEL) ]; then \
|
|
+ mkdir -p $(LOCALMODEL)
|
|
+ if [ -d $(LOCALMODEL) ]; then \
|
|
rm -f $(LOCALMODEL)/KonicaMinolta*; \
|
|
cd PPD; \
|
|
for ppd in *.ppd; do \
|
|
@@ -1258,7 +1187,7 @@ clean:
|
|
-rm -f $(PROGS) $(BINPROGS) $(SHELLS)
|
|
-rm -f *.zc *.zm *.zm1
|
|
-rm -f xxx.* xxxomatic
|
|
- -rm -f foo2zjs.o jbig.o jbig_ar.o zjsdecode.o foo2hp.o
|
|
+ -rm -f foo2zjs.o zjsdecode.o foo2hp.o
|
|
-rm -f foo2oak.o oakdecode.o
|
|
-rm -f foo2xqx.o xqxdecode.o
|
|
-rm -f foo2lava.o lavadecode.o
|
|
@@ -1288,30 +1217,28 @@ clean:
|
|
#
|
|
# Header dependencies
|
|
#
|
|
-jbig.o: jbig.h
|
|
+foo2ddst.o: ddst.h
|
|
+foo2hiperc.o: hiperc.h
|
|
+foo2hp.o: zjs.h cups.h
|
|
+foo2hbpl2.o: hbpl.h
|
|
+foo2lava.o:
|
|
+foo2oak.o: oak.h
|
|
+foo2qpdl.o: qpdl.h
|
|
+foo2slx.o: slx.h
|
|
+foo2xqx.o: xqx.h
|
|
+foo2zjs.o: zjs.h
|
|
|
|
-foo2ddst.o: jbig.h ddst.h
|
|
-foo2hiperc.o: jbig.h hiperc.h
|
|
-foo2hp.o: jbig.h zjs.h cups.h
|
|
-foo2hbpl2.o: jbig.h hbpl.h
|
|
-foo2lava.o: jbig.h
|
|
-foo2oak.o: jbig.h oak.h
|
|
-foo2qpdl.o: jbig.h qpdl.h
|
|
-foo2slx.o: jbig.h slx.h
|
|
-foo2xqx.o: jbig.h xqx.h
|
|
-foo2zjs.o: jbig.h zjs.h
|
|
+ddstdecode.o: ddst.h
|
|
+gipddecode.o: slx.h
|
|
+hbpldecode.o:
|
|
+hipercdecode.o: hiperc.h
|
|
+lavadecode.o:
|
|
+opldecode.o:
|
|
+qpdldecode.o:
|
|
+slxdecode.o: slx.h
|
|
+xqxdecode.o: xqx.h
|
|
+zjsdecode.o: zjs.h
|
|
|
|
-ddstdecode.o: ddst.h jbig.h
|
|
-gipddecode.o: slx.h jbig.h
|
|
-hbpldecode.o: jbig.h
|
|
-hipercdecode.o: hiperc.h jbig.h
|
|
-lavadecode.o: jbig.h
|
|
-opldecode.o: jbig.h
|
|
-qpdldecode.o: jbig.h
|
|
-slxdecode.o: slx.h jbig.h
|
|
-xqxdecode.o: xqx.h jbig.h
|
|
-zjsdecode.o: jbig.h zjs.h
|
|
-
|
|
#
|
|
# foo2* Regression tests
|
|
#
|
|
@@ -1631,11 +1558,8 @@ install-doc: doc
|
|
#
|
|
$(INSTALL) -d -m 755 $(DOCDIR)
|
|
$(INSTALL) -c -m 644 manual.pdf $(DOCDIR)
|
|
- $(INSTALL) -c -m 644 COPYING $(DOCDIR)
|
|
$(INSTALL) -c -m 644 INSTALL $(DOCDIR)
|
|
- $(INSTALL) -c -m 644 INSTALL.osx $(DOCDIR)
|
|
$(INSTALL) -c -m 644 README $(DOCDIR)
|
|
- $(INSTALL) -c -m 644 ChangeLog $(DOCDIR)
|
|
|
|
GROFF=/usr/local/test/bin/groff
|
|
GROFF=groff
|