|
 |
68b3c6 |
diff -up pnm2ppa-1.04/Makefile.ldflags pnm2ppa-1.04/Makefile
|
|
|
68b3c6 |
--- pnm2ppa-1.04/Makefile.ldflags 2018-03-01 15:38:09.225582684 +0100
|
|
|
68b3c6 |
+++ pnm2ppa-1.04/Makefile 2018-03-01 15:50:34.307261745 +0100
|
|
|
68b3c6 |
@@ -11,7 +11,6 @@ INSTALL=install
|
|
|
68b3c6 |
|
|
|
68b3c6 |
# production build
|
|
|
68b3c6 |
CFLAGS=$(RPM_OPT_FLAGS) -DNDEBUG
|
|
|
68b3c6 |
-LDFLAGS=-lm
|
|
|
68b3c6 |
OBJS = pnm2ppa.o syslog.o ppa.o image.o dither.o cutswath.o hash_ink.o gamma.o
|
|
|
68b3c6 |
SRC = pnm2ppa.c syslog.c ppa.c image.c dither.c cutswath.c hash_ink.c gamma.c
|
|
|
68b3c6 |
|
|
|
68b3c6 |
@@ -108,10 +107,10 @@ uninstall:
|
|
|
68b3c6 |
rm -f $(CONFDIR)/pnm2ppa.conf
|
|
|
68b3c6 |
|
|
|
68b3c6 |
pnm2ppa: $(OBJS)
|
|
|
68b3c6 |
- $(CC) $(LDFLAGS) $(CFLAGS) -o pnm2ppa $(OBJS)
|
|
|
68b3c6 |
+ $(CC) -lm $(LDFLAGS) $(CFLAGS) -o pnm2ppa $(OBJS)
|
|
|
68b3c6 |
|
|
|
68b3c6 |
calibrate_ppa: calibrate_ppa.o pnmtools.o gamma.o
|
|
|
68b3c6 |
- $(CC) $(LDFLAGS) $(CFLAGS) -o calibrate_ppa calibrate_ppa.o pnmtools.o gamma.o
|
|
|
68b3c6 |
+ $(CC) -lm $(LDFLAGS) $(CFLAGS) -o calibrate_ppa calibrate_ppa.o pnmtools.o gamma.o
|
|
|
68b3c6 |
|
|
|
68b3c6 |
calibrate_ppa.o: calibrate_ppa.c global.h image.h defaults.h pnmtools.h
|
|
|
68b3c6 |
$(CC) $(CFLAGS) -c calibrate_ppa.c
|
|
|
68b3c6 |
@@ -144,7 +143,7 @@ syslog.o: syslog.c syslog.h global.h
|
|
|
68b3c6 |
$(CC) $(CFLAGS) -c syslog.c
|
|
|
68b3c6 |
|
|
|
68b3c6 |
make_hash_ink: make_hash_ink.c palette.h hash_ink.h
|
|
|
68b3c6 |
- $(CC) $(CFLAGS) -o make_hash_ink make_hash_ink.c
|
|
|
68b3c6 |
+ $(CC) $(CFLAGS) -lm $(LDFLAGS) -o make_hash_ink make_hash_ink.c
|
|
|
68b3c6 |
|
|
|
68b3c6 |
hash_ink.c: make_hash_ink
|
|
|
68b3c6 |
./make_hash_ink 4 3 > hash_ink.c
|
|
|
68b3c6 |
diff -up pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile.ldflags pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile
|
|
|
68b3c6 |
--- pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile.ldflags 2018-03-01 15:38:09.226582676 +0100
|
|
|
68b3c6 |
+++ pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile 2018-03-01 15:53:22.016739424 +0100
|
|
|
68b3c6 |
@@ -1,6 +1,5 @@
|
|
|
68b3c6 |
CC=gcc
|
|
|
68b3c6 |
CFLAGS=$(RPM_OPT_FLAGS)
|
|
|
68b3c6 |
-LDFLAGS=
|
|
|
68b3c6 |
PRINTER=HP720
|
|
|
68b3c6 |
|
|
|
68b3c6 |
default: all
|
|
|
68b3c6 |
@@ -23,7 +22,7 @@ pbm2ppa: pbm2ppa.o ppa.o pbm.o cutswath.
|
|
|
68b3c6 |
$(CC) $(LDFLAGS) -o pbm2ppa pbm2ppa.o ppa.o pbm.o cutswath.o
|
|
|
68b3c6 |
|
|
|
68b3c6 |
pbmtpg: pbmtpg.o
|
|
|
68b3c6 |
- $(CC) $(CFLAGS) -o pbmtpg pbmtpg.o -lm
|
|
|
68b3c6 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o pbmtpg pbmtpg.o -lm
|
|
|
68b3c6 |
|
|
|
68b3c6 |
.c.o: $*.c ppa.h pbm.h
|
|
|
68b3c6 |
$(CC) $(CFLAGS) -DDEFAULT_PRINTER=$(PRINTER) -c $*.c
|