summaryrefslogtreecommitdiff
path: root/graphics/netpbm/files/patch-be
blob: 8421fafebc627ceb7b5960fd48e16d7bb515f9ac (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
--- pgm/Makefile.orig	Sat May  6 12:01:47 2000
+++ pgm/Makefile	Mon May  8 00:00:00 2000
@@ -3,7 +3,7 @@
 
 LIBROOT = pgm
 LIBPGM = lib$(LIBROOT).$(NETPBMLIBSUFFIX)
-MAJ = 9
+MAJ = 1
 MIN = 0
 
 PBMDIR = $(SRCDIR)/pbm
@@ -13,6 +13,7 @@
 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,11 +44,11 @@
 
 # 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)
 
 # And libraries.
 $(PBMDIR)/$(LIBPBM): FORCE