openbsd-ports/graphics/netpbm/patches/patch-pbm_Makefile

46 lines
1.1 KiB
Plaintext
Raw Normal View History

2001-10-02 23:09:31 -04:00
--- pbm/Makefile.orig Mon Sep 10 22:17:16 2001
+++ pbm/Makefile Mon Sep 10 22:20:36 2001
@@ -52,6 +52,7 @@ MERGE_OBJECTS = $(patsubst %,%.o2, $(MER
# Library objects to be built and linked by Makefile.common:
LIBOBJECTS = libpm.o libpbm1.o libpbm2.o libpbm3.o libpbm4.o libpbm5.o
+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
ifneq (${VMS}x,x)
LIBOBJECTS += libpbmvms.o
endif
@@ -68,26 +69,21 @@ INTERFACE_HEADERS = pm.h pbm.h
.PHONY: all
all: $(LIBPBM) $(BINARIES) $(EXTRA_STATICLIB)
- $(MAKE) -C pbmtoppa all
.PHONY: merge
-merge: $(MERGENAME)
- $(MAKE) -C pbmtoppa all
+merge: $(MERGENAME) $(EXTRA_STATICLIB)
.PHONY: install.bin
install.bin: install.bin.common
- $(MAKE) -C pbmtoppa install.bin
.PHONY: install.merge
install.merge: install.merge.common
- $(MAKE) -C pbmtoppa install.bin
.PHONY: install.lib
install.lib: install.lib.common
.PHONY: install.man
install.man: install.man.common
- $(MAKE) -C pbmtoppa install.man
HEADERLINKS = pm_config.h version.h compile.h
@@ -109,6 +105,5 @@ $(BUILDDIR)/shhopt/libshhopt.a:
.PHONY: clean
clean: clean.common
rm -f thinkjettopbm.c
- $(MAKE) -C pbmtoppa clean
FORCE: