diff options
Diffstat (limited to 'graphics/netpbm/files/patch-bb')
| -rw-r--r-- | graphics/netpbm/files/patch-bb | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/graphics/netpbm/files/patch-bb b/graphics/netpbm/files/patch-bb index 3fabbc077d61..5f0a5e1e43e8 100644 --- a/graphics/netpbm/files/patch-bb +++ b/graphics/netpbm/files/patch-bb @@ -1,13 +1,13 @@ ---- Makefile.common.orig Tue Mar 27 00:25:04 2001 -+++ Makefile.common Tue Mar 27 00:00:00 2001 -@@ -151,24 +151,20 @@ +--- Makefile.common.orig Tue May 1 00:45:34 2001 ++++ Makefile.common Tue May 15 00:00:00 2001 +@@ -155,24 +155,20 @@ $(LIBOBJECTS): %.o: $(SRCSUBDIR)/%.c $(HEADERLINKS) # Note that the user may have configured -I options into CFLAGS. -+ $(CC) -c $(INCLUDE) $(CFLAGS) -o $@ $< ++ $(CC) -c $(INCLUDE) $(CFLAGS) $(CDEBUG) -o $@ $< + +$(SHLIBOBJECTS): %.lo: $(SRCSUBDIR)/%.c $(HEADERLINKS) - $(CC) -c $(INCLUDE) $(CFLAGS) $(CFLAGS_SHLIB) -o $@ $< + $(CC) -c $(INCLUDE) $(CFLAGS) $(CFLAGS_SHLIB) $(CDEBUG) -o $@ $< -SONAME = lib$(LIBROOT).so.$(MAJ) +SONAME = lib$(LIBROOT).so.$(SOVER) @@ -25,14 +25,14 @@ -lib$(LIBROOT).so.$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) \ - $(LIBOPT) - $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \ -- `$(LIBOPT) $(LIBLIBS)` -lc +- `$(LIBOPT) $(LIBLIBS)` -lc $(CDEBUG) +$(SONAME): $(SHLIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) $(LIBOPT) lib$(LIBROOT).a + $(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \ -+ `$(LIBOPT) $(LIBLIBS)` $(LDFLAGS) ++ `$(LIBOPT) $(LIBLIBS)` $(LDFLAGS) $(CDEBUG) # Static library. Unused by default, but with a small change to make files... lib$(LIBROOT).a: $(LIBOBJECTS) $(LIBOBJECTS_X) -@@ -200,7 +196,7 @@ +@@ -204,7 +200,7 @@ install.merge.common: $(MERGENAME) $(NOMERGEBINARIES) install.script cd $(INSTALLBINARIES) ; rm -f $(BINARIES) $(MERGE_ALIASES) ifneq ($(MERGENAME)x,x) @@ -41,7 +41,7 @@ $(MERGENAME) $(INSTALLBINARIES) cd $(INSTALLBINARIES) ; \ for i in $(MERGEBINARIES) $(MERGE_ALIASES) ; \ -@@ -210,7 +206,7 @@ +@@ -214,7 +210,7 @@ ifneq ($(NOMERGEBINARIES)x,x) for x in $(NOMERGEBINARIES); \ do \ @@ -50,7 +50,7 @@ $$x $(INSTALLBINARIES); \ done endif -@@ -221,7 +217,7 @@ +@@ -225,7 +221,7 @@ # Make and Install know that pbmmake.exe counts as pbmmake. for x in $(BINARIES); \ do \ @@ -59,7 +59,7 @@ $$x $(INSTALLBINARIES); \ done -@@ -230,7 +226,7 @@ +@@ -234,7 +230,7 @@ ifneq ($(SCRIPTS)x,x) for x in $(SCRIPTS); \ do \ @@ -68,7 +68,7 @@ $(INSTALLSCRIPTS); \ done endif -@@ -267,7 +263,7 @@ +@@ -271,7 +267,7 @@ # directory when you compile your programs. for x in $(INTERFACE_HEADERS); \ do \ @@ -77,7 +77,7 @@ $(INSTALLHDRS); \ done -@@ -275,15 +271,14 @@ +@@ -279,15 +275,14 @@ # .PHONY: install.staticlib install.staticlib: lib$(LIBROOT).a |