diff options
Diffstat (limited to 'x11/fltk/patches/patch-af')
| -rw-r--r-- | x11/fltk/patches/patch-af | 72 |
1 files changed, 16 insertions, 56 deletions
diff --git a/x11/fltk/patches/patch-af b/x11/fltk/patches/patch-af index e9f680a1bf7..b94ef5fec27 100644 --- a/x11/fltk/patches/patch-af +++ b/x11/fltk/patches/patch-af @@ -1,64 +1,24 @@ -$NetBSD: patch-af,v 1.7 2006/01/22 11:11:34 wiz Exp $ +$NetBSD: patch-af,v 1.8 2008/11/10 19:03:15 adam Exp $ ---- makeinclude.in.orig 2006-01-15 18:36:16.000000000 +0000 +--- makeinclude.in.orig 2008-02-26 16:26:08.000000000 +0100 +++ makeinclude.in -@@ -49,8 +49,8 @@ SHELL = /bin/sh - STRIP = strip - - # compiler names: --CXX = @CXX@ --CC = @CC@ -+CXX = $(LIBTOOL) @CXX@ -+CC = $(LIBTOOL) @CC@ - MAKEDEPEND = @MAKEDEPEND@ - - # flags for C++ compiler: -@@ -60,6 +60,7 @@ CXXFLAGS = $(OPTIM) @LARGEFILE@ @CPPFLAG - - # program to make the archive: - LIBNAME = @LIBNAME@ -+LIBTOOL = @LIBTOOL@ - FLLIBNAME = @FLLIBNAME@ - GLLIBNAME = @GLLIBNAME@ - IMGLIBNAME = @IMGLIBNAME@ -@@ -74,7 +75,8 @@ DSOCOMMAND = @DSOCOMMAND@ - - # libraries to link with: - AUDIOLIBS = @AUDIOLIBS@ --LDLIBS = @LDFLAGS@ @LIBS@ -+#LDLIBS = @LDFLAGS@ @LIBS@ -+LDLIBS = $(GLDLIBS) - GLDLIBS = @LDFLAGS@ @GLLIB@ @LIBS@ - LINKFLTK = @LINKFLTK@ - LINKFLTKGL = @LINKFLTKGL@ -@@ -86,6 +88,12 @@ IMAGELIBS = -L../lib @IMAGELIBS@ - # image libraries to build... - IMAGEDIRS = @JPEG@ @ZLIB@ @PNG@ - -+# installation programs: -+INSTALL_BIN =$(LIBTOOL) cp -+INSTALL_DATA =cp -+INSTALL_LIB =$(LIBTOOL) cp -+INSTALL_MAN =cp -+ - # The extension to use for executables... - EXEEXT = @EXEEXT@ - -@@ -114,7 +122,7 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@ - .SILENT: - - # Build commands and filename extensions... --.SUFFIXES: .0 .1 .3 .c .cxx .h .fl .man .o .z $(EXEEXT) -+.SUFFIXES: .0 .1 .3 .6 .c .cxx .h .fl .man .o .z $(EXEEXT) +@@ -134,16 +135,16 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@ .o$(EXEEXT): echo Linking $@... -@@ -129,7 +137,7 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@ +- $(CXX) $(ARCHFLAGS) $(LDFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ ++ ${LIBTOOL} --mode=link $(CXX) $(ARCHFLAGS) $(LDFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ + $(POSTBUILD) $@ ../FL/mac.r + + .c.o: + echo Compiling $<... +- $(CC) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $< ++ ${LIBTOOL} --mode=compile $(CC) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $< + + .cxx.o: echo Compiling $<... - $(CXX) -I.. @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $< +- $(CXX) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $< ++ ${LIBTOOL} --mode=compile $(CXX) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $< --.man.0 .man.1 .man.3: -+.man.0 .man.1 .man.3 .man.6: + .man.0 .man.1 .man.3 .man.6: echo Formatting $<... - rm -f $@ - $(NROFF) -man $< >$@ |