20 lines
632 B
Plaintext
20 lines
632 B
Plaintext
|
--- pnm/Makefile.orig Mon Sep 10 22:42:10 2001
|
||
|
|
+++ pnm/Makefile Mon Sep 10 22:44:28 2001
|
||
|
|
@@ -155,6 +155,7 @@ OBJECTS = $(patsubst %, %.o, $(BINARIES)
|
||
|
|
MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
|
||
|
|
|
||
|
|
LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o libpam.o
|
||
|
|
+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
|
||
|
|
|
||
|
|
MANUALS1 = $(BINARIES) $(SCRIPTS)
|
||
|
|
MANUALS3 = libpnm
|
||
|
|
@@ -172,7 +173,7 @@ endif
|
||
|
|
$(MAKE) -C jbig all
|
||
|
|
$(MAKE) -C pnmtopalm all
|
||
|
|
PHONY: merge
|
||
|
|
-merge: $(MERGENAME) $(NOMERGEBINARIES)
|
||
|
|
+merge: $(MERGENAME) $(NOMERGEBINARIES) $(EXTRA_STATICLIB)
|
||
|
|
ifneq ($(BUILD_FIASCO), N)
|
||
|
|
$(MAKE) -C fiasco all
|
||
|
|
endif
|