From 5f8b9d683bfa27efc8abda4a184edf85437830eb Mon Sep 17 00:00:00 2001 From: Steffen Joeris Date: Tue, 4 Oct 2016 11:43:43 +0200 Subject: Update makefiles to Debian best-practices Author: Luca Capello Author: Didier Raboud --- Makefile | 71 +++++++++++++++++++++++-------------------------- icc2ps/Makefile | 4 +-- 2 files changed, 35 insertions(+), 40 deletions(-) diff --git a/Makefile b/Makefile index 608147d..2f010b1 100644 --- a/Makefile +++ b/Makefile @@ -17,9 +17,7 @@ SYSNAME := $(shell uname -n) VERSION=0.0 # Installation prefix... -PREFIX=/usr/local PREFIX=/usr -PREFIX=$(DESTDIR)/usr # Pathnames for this package... BIN=$(PREFIX)/bin @@ -39,7 +37,7 @@ INSTALL=install ROOT=root # Pathnames for referenced packages... -FOODB=$(DESTDIR)/usr/share/foomatic/db/source +FOODB=$(DESTDIR)/share/foomatic/db/source # User ID's LPuid=-oroot @@ -468,34 +466,34 @@ all-done: foo2ddst: foo2ddst.o $(LIBJBG) - $(CC) $(CFLAGS) -o $@ foo2ddst.o $(LIBJBG) + $(CC) $(CFLAGS) -o $@ foo2ddst.o $(LIBJBG) $(LDFLAGS) foo2hbpl2: foo2hbpl2.o $(LIBJBG) - $(CC) $(CFLAGS) -o $@ foo2hbpl2.o $(LIBJBG) + $(CC) $(CFLAGS) -o $@ foo2hbpl2.o $(LIBJBG) $(LDFLAGS) foo2hp: foo2hp.o $(LIBJBG) - $(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG) + $(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG) $(LDFLAGS) foo2hiperc: foo2hiperc.o $(LIBJBG) - $(CC) $(CFLAGS) -o $@ foo2hiperc.o $(LIBJBG) + $(CC) $(CFLAGS) -o $@ foo2hiperc.o $(LIBJBG) $(LDFLAGS) foo2lava: foo2lava.o $(LIBJBG) - $(CC) $(CFLAGS) -o $@ foo2lava.o $(LIBJBG) + $(CC) $(CFLAGS) -o $@ foo2lava.o $(LIBJBG) $(LDFLAGS) foo2oak: foo2oak.o $(LIBJBG) - $(CC) $(CFLAGS) -o $@ foo2oak.o $(LIBJBG) + $(CC) $(CFLAGS) -o $@ foo2oak.o $(LIBJBG) $(LDFLAGS) foo2qpdl: foo2qpdl.o $(LIBJBG) - $(CC) $(CFLAGS) -o $@ foo2qpdl.o $(LIBJBG) + $(CC) $(CFLAGS) -o $@ foo2qpdl.o $(LIBJBG) $(LDFLAGS) foo2slx: foo2slx.o $(LIBJBG) - $(CC) $(CFLAGS) -o $@ foo2slx.o $(LIBJBG) + $(CC) $(CFLAGS) -o $@ foo2slx.o $(LIBJBG) $(LDFLAGS) foo2xqx: foo2xqx.o $(LIBJBG) - $(CC) $(CFLAGS) -o $@ foo2xqx.o $(LIBJBG) + $(CC) $(CFLAGS) -o $@ foo2xqx.o $(LIBJBG) $(LDFLAGS) foo2zjs: foo2zjs.o $(LIBJBG) - $(CC) $(CFLAGS) -o $@ foo2zjs.o $(LIBJBG) + $(CC) $(CFLAGS) -o $@ foo2zjs.o $(LIBJBG) $(LDFLAGS) foo2ddst-wrapper: foo2ddst-wrapper.in Makefile @@ -581,49 +579,49 @@ ifeq ($(UNAME),Darwin) endif ok: ok.o $(LIBJBG) - $(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@ + $(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@ $(LDFLAGS) ddstdecode: ddstdecode.o $(LIBJBG) - $(CC) $(CFLAGS) ddstdecode.o $(LIBJBG) -o $@ + $(CC) $(CFLAGS) ddstdecode.o $(LIBJBG) -o $@ $(LDFLAGS) gipddecode: gipddecode.o $(LIBJBG) - $(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@ + $(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@ $(LDFLAGS) hbpldecode: hbpldecode.o $(LIBJBG) - $(CC) $(CFLAGS) hbpldecode.o $(LIBJBG) -o $@ + $(CC) $(CFLAGS) hbpldecode.o $(LIBJBG) -o $@ $(LDFLAGS) hipercdecode: hipercdecode.o $(LIBJBG) - $(CC) $(CFLAGS) hipercdecode.o $(LIBJBG) -o $@ + $(CC) $(CFLAGS) hipercdecode.o $(LIBJBG) -o $@ $(LDFLAGS) lavadecode: lavadecode.o $(LIBJBG) - $(CC) $(CFLAGS) lavadecode.o $(LIBJBG) -o $@ + $(CC) $(CFLAGS) lavadecode.o $(LIBJBG) -o $@ $(LDFLAGS) oakdecode: oakdecode.o $(LIBJBG) - $(CC) $(CFLAGS) -g oakdecode.o $(LIBJBG) -o $@ + $(CC) $(CFLAGS) -g oakdecode.o $(LIBJBG) -o $@ $(LDFLAGS) opldecode: opldecode.o $(LIBJBG) - $(CC) $(CFLAGS) -g opldecode.o $(LIBJBG) -o $@ + $(CC) $(CFLAGS) -g opldecode.o $(LIBJBG) -o $@ $(LDFLAGS) qpdldecode: qpdldecode.o $(LIBJBG) - $(CC) $(CFLAGS) qpdldecode.o $(LIBJBG) -o $@ + $(CC) $(CFLAGS) qpdldecode.o $(LIBJBG) -o $@ $(LDFLAGS) splcdecode: splcdecode.o $(LIBJBG) - $(CC) $(CFLAGS) splcdecode.o $(LIBJBG) -lz -o $@ + $(CC) $(CFLAGS) splcdecode.o $(LIBJBG) -lz -o $@ $(LDFLAGS) slxdecode: slxdecode.o $(LIBJBG) - $(CC) $(CFLAGS) slxdecode.o $(LIBJBG) -o $@ + $(CC) $(CFLAGS) slxdecode.o $(LIBJBG) -o $@ $(LDFLAGS) xqxdecode: xqxdecode.o $(LIBJBG) - $(CC) $(CFLAGS) xqxdecode.o $(LIBJBG) -o $@ + $(CC) $(CFLAGS) xqxdecode.o $(LIBJBG) -o $@ $(LDFLAGS) zjsdecode: zjsdecode.o $(LIBJBG) - $(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@ + $(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@ $(LDFLAGS) 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 -lcups -o $@ $(LDFLAGS) command2foo2lava-pjl.o: command2foo2lava-pjl.c - $(CC) $(CFLAGS) -I/usr/local/include -c command2foo2lava-pjl.c + $(CC) $(CPPFLAGS) $(CFLAGS) -I/usr/local/include -c command2foo2lava-pjl.c # # Installation rules @@ -669,8 +667,6 @@ install-test: # -UDEVBIN=$(DESTDIR)/bin/ - install-prog: # # Install driver, wrapper, and development tools @@ -679,7 +675,7 @@ install-prog: $(INSTALL) -c $(PROGS) $(SHELLS) $(BIN)/ if [ "$(BINPROGS)" != "" ]; then \ $(INSTALL) -d $(UDEVBIN); \ - $(INSTALL) -c $(BINPROGS) $(UDEVBIN); \ + $(INSTALL) -c $(BINPROGS) $(BIN); \ fi # # Install gamma correction files. These are just templates, @@ -873,7 +869,7 @@ install-extra: done MODEL=$(PREFIX)/share/cups/model -LOCALMODEL=$(DESTDIR)/usr/local/share/cups/model +LOCALMODEL=$(DESTDIR)/local/share/cups/model MACMODEL=/Library/Printers/PPDs/Contents/Resources PPD=$(PREFIX)/share/ppd VARPPD=/var/lp/ppd @@ -934,9 +930,9 @@ install-ppd: done; \ fi -APPL=$(DESTDIR)/usr/share/applications -OLDAPPL=$(DESTDIR)/usr/share/gnome/apps/System -PIXMAPS=$(DESTDIR)/usr/share/pixmaps +APPL=$(DESTDIR)/share/applications +OLDAPPL=$(DESTDIR)/share/gnome/apps/System +PIXMAPS=$(DESTDIR)/share/pixmaps install-desktop: # @@ -1494,10 +1490,9 @@ ppd: *) driver=foo2zjs;; \ esac; \ echo $$driver - $$printer; \ - ENGINE=../foomatic/foomatic-db-engine; \ PERL5LIB=$$ENGINE/lib \ FOOMATICDB=foomatic-db \ - $$ENGINE/foomatic-ppdfile \ + /usr/bin/foomatic-ppdfile \ -d $$driver -p $$printer \ > PPD/$$printer.ppd; \ done @@ -1955,7 +1950,7 @@ FRC: misc: pksm2bitcmyk phorum-logo.gif pksm2bitcmyk: pksm2bitcmyk.c - $(CC) $(CFLAGS) pksm2bitcmyk.c -lnetpbm -o $@ + $(CC) $(CFLAGS) pksm2bitcmyk.c -lnetpbm -o $@ $(LDFLAGS) phorum-logo.gif: archhp.fig fig2dev -L gif -m.25 archhp.fig | giftrans -t "#ffffff" -o $@ diff --git a/icc2ps/Makefile b/icc2ps/Makefile index f3abb99..215105b 100644 --- a/icc2ps/Makefile +++ b/icc2ps/Makefile @@ -9,7 +9,7 @@ SRC= icc2ps.c xgetopt.c LIB= cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \ cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \ cmssamp.c cmswtpnt.c cmsxform.c cmsio0.c cmsvirt.c -CFLAGS= -O3 +CFLAGS+= -O3 INSTALL=install ifeq ($(UNAME),SunOS) INSTALL=/usr/ucb/install @@ -21,7 +21,7 @@ endif all: foo2zjs-icc2ps man foo2zjs-icc2ps: $(SRC) $(LIB) - $(CC) $(CFLAGS) $(SRC) $(LIB) -lm -o $@ + $(CC) $(CPPFLAGS) $(CFLAGS) $(SRC) $(LIB) -lm -o $@ $(LDFLAGS) install: all $(INSTALL) -c foo2zjs-icc2ps $(BIN)