1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-27 21:29:02 +00:00
freebsd-ports/graphics/netpbm/files/patch-bd
Steve Price c88dda479a Update to version 9.8.
PR:		21035
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>
2000-09-05 01:11:53 +00:00

75 lines
1.6 KiB
Plaintext

--- pbm/Makefile.orig Sat Sep 2 12:59:29 2000
+++ pbm/Makefile Tue Sep 5 00:00:00 2000
@@ -5,7 +5,7 @@
include $(BUILDDIR)/Makefile.config
-INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/shhopt
+INCLUDE = -I$(SRCDIR)
# Shared library naming
LIBROOT = pbm
@@ -16,6 +16,8 @@
LIBLIBS =
NETPBMLIBS = $(LIBPBM)
+SOVER = 1
+
PORTBINARIES = atktopbm brushtopbm cmuwmtopbm g3topbm \
icontopbm macptopbm mdatopbm mgrtopbm \
pbmclean pbmlife pbmmake pbmmask pbmpscale \
@@ -38,11 +40,10 @@
# Library objects to be built and linked by Makefile.common:
LIBOBJECTS = libpbm1.o libpbm2.o libpbm3.o libpbm4.o libpbm5.o
+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
ifneq (${VMS}x,x)
LIBOBJECTS += libpbmvms.o
endif
-# Library objects to be linked but not built by Makefile.common:
-LIBOBJECTS_X = $(BUILDDIR)/shhopt/shhopt.o
MANUALS1 = $(BINARIES)
MANUALS3 = libpbm
@@ -54,26 +55,21 @@
.PHONY: all
all: $(BINARIES)
- $(MAKE) -C pbmtoppa all
.PHONY: merge
merge: $(MERGENAME)
- $(MAKE) -C pbmtoppa all
.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
include $(SRCDIR)/Makefile.common
@@ -81,13 +77,7 @@
../compile.h:
$(MAKE) -C $(SRCDIR) compile.h
-$(BUILDDIR)/shhopt/shhopt.o:
- cd ../shhopt; $(MAKE) shhopt.o
-$(BUILDDIR)/shhopt/libshhopt.a:
- cd ../shhopt; $(MAKE) libshhopt.a
-
.PHONY: clean
clean: clean.common
- $(MAKE) -C pbmtoppa clean
FORCE: