Link tstcodec85 against libjbig85

This also fixes an unintentional race condition in the build.
This commit is contained in:
Yaakov Selkowitz 2023-01-24 15:21:27 -05:00
parent 2dd56db824
commit f31f3e78b4
2 changed files with 3 additions and 3 deletions

View File

@ -20,7 +20,7 @@ diff -Naur jbigkit-2.1.old/libjbig/Makefile jbigkit-2.1/libjbig/Makefile
-tstcodec85: tstcodec85.o jbig85.o jbig_ar.o
- $(CC) $(CFLAGS) -o tstcodec85 tstcodec85.o jbig85.o jbig_ar.o
+tstcodec85: tstcodec85.o libjbig85.so
+ $(CC) $(CFLAGS) -o tstcodec85 $^ -L. -ljbig
+ $(CC) $(CFLAGS) -o tstcodec85 $< -L. -ljbig85
-libjbig.a: jbig.o jbig_ar.o
- rm -f libjbig.a

View File

@ -9,8 +9,8 @@ diff -up jbigkit-2.1/libjbig/Makefile.ldflags jbigkit-2.1/libjbig/Makefile
+ $(CC) $(CFLAGS) -o tstcodec $< -L. -ljbig $(LDFLAGS)
tstcodec85: tstcodec85.o libjbig85.so
- $(CC) $(CFLAGS) -o tstcodec85 $^ -L. -ljbig
+ $(CC) $(CFLAGS) -o tstcodec85 $^ -L. -ljbig $(LDFLAGS)
- $(CC) $(CFLAGS) -o tstcodec85 $< -L. -ljbig85
+ $(CC) $(CFLAGS) -o tstcodec85 $< -L. -ljbig85 $(LDFLAGS)
%.so: %.so.$(VERSION)
ln -sf $< $@