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-be
2000-04-07 21:54:04 +00:00

52 lines
1.4 KiB
Plaintext

--- pgm/Makefile.orig Fri Mar 24 07:43:44 2000
+++ pgm/Makefile Sat Apr 1 12:00:00 2000
@@ -10,9 +10,10 @@
INCLUDEPBM = -I$(PBMDIR)
LIBPBM = libpbm.so
-INCLUDE = -I$(SRCDIR) $(INCLUDEPBM)
+INCLUDE = -I$(SRCDIR) $(INCLUDEPBM) -I$(SRCDIR)/shhopt
NETPBMLIBS = $(LIBPGM) $(PBMDIR)/$(LIBPBM)
+NETPBMLD = -L. -lpgm -L$(PBMDIR) -lpbm
LIBLIBS = $(PBMDIR)/$(LIBPBM)
PORTBINARIES = asciitopgm bioradtopgm fstopgm hipstopgm \
@@ -26,6 +27,7 @@
MERGE_OBJECTS = $(patsubst %,%.o2, $(BINARIES))
LIBOBJECTS = libpgm1.o libpgm2.o
+LIBSOBJECTS = libpgm1.so libpgm2.so
MANUALS1 = $(BINARIES)
MANUALS3 = libpgm
@@ -42,22 +44,25 @@
# Rules for plain programs.
$(PORTBINARIES): %: %.o $(NETPBMLIBS)
- $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(CDEBUG)
+ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(CDEBUG)
# Rule for math-dependent programs.
$(MATHBINARIES): %: %.o $(NETPBMLIBS)
- $(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLIBS) $(CDEBUG)
+ $(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLD) $(CDEBUG)
# Rule for objects.
$(OBJECTS) $(LIBOBJECTS): %.o: %.c
$(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
+$(LIBSOBJECTS): %.so: %.c
+ $(CC) -c -fpic -DPIC $(CFLAGS) $(INCLUDE) -o $@ $<
+
$(MERGE_OBJECTS): %.o2: %.c
$(CC) -c $(CFLAGS) $(INCLUDE) "-Dmain=$*_main" -o $@ $<
# And libraries.
$(PBMDIR)/$(LIBPBM): FORCE
- cd $(PBMDIR) ; make $(LIBPBM)
+ cd $(PBMDIR) ; $(MAKE) $(LIBPBM)
.PHONY: install.bin
install.bin: install.bin.common