diff options
| author | Chris Piazza <cpiazza@FreeBSD.org> | 2000-05-19 08:34:13 +0000 |
|---|---|---|
| committer | Chris Piazza <cpiazza@FreeBSD.org> | 2000-05-19 08:34:13 +0000 |
| commit | 1e508f2672cb036a23ec93a8657e6335293f73bc (patch) | |
| tree | 9c9ac3696ba6276ea4d8087f838413c2f5d6ae96 /graphics/netpbm/files/patch-be | |
| parent | Update to 1.16 (diff) | |
Update to 9.1
PR: 18437
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Notes
Notes:
svn path=/head/; revision=28593
Diffstat (limited to 'graphics/netpbm/files/patch-be')
| -rw-r--r-- | graphics/netpbm/files/patch-be | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/graphics/netpbm/files/patch-be b/graphics/netpbm/files/patch-be index 97416720f17d..8421fafebc62 100644 --- a/graphics/netpbm/files/patch-be +++ b/graphics/netpbm/files/patch-be @@ -1,11 +1,16 @@ ---- 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 +--- pgm/Makefile.orig Sat May 6 12:01:47 2000 ++++ pgm/Makefile Mon May 8 00:00:00 2000 +@@ -3,7 +3,7 @@ --INCLUDE = -I$(SRCDIR) $(INCLUDEPBM) -+INCLUDE = -I$(SRCDIR) $(INCLUDEPBM) -I$(SRCDIR)/shhopt + 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 @@ -20,7 +25,7 @@ MANUALS1 = $(BINARIES) MANUALS3 = libpgm -@@ -42,22 +44,25 @@ +@@ -42,11 +44,11 @@ # Rules for plain programs. $(PORTBINARIES): %: %.o $(NETPBMLIBS) @@ -32,20 +37,5 @@ - $(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 |