diff options
Diffstat (limited to 'makeinclude.in')
| -rw-r--r-- | makeinclude.in | 43 |
1 files changed, 28 insertions, 15 deletions
diff --git a/makeinclude.in b/makeinclude.in index cfdfbad..a12d9a5 100644 --- a/makeinclude.in +++ b/makeinclude.in @@ -1,9 +1,9 @@ # -# "$Id: makeinclude.in 4756 2006-01-15 18:36:16Z mike $" +# "$Id: makeinclude.in 5800 2007-05-03 15:49:59Z matt $" # # Make include file for the Fast Light Tool Kit (FLTK). # -# Copyright 1998-2006 by Bill Spitzak and others. +# Copyright 1998-2007 by Bill Spitzak and others. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public @@ -29,6 +29,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ datadir = @datadir@ +datarootdir = @datarootdir@ includedir = @includedir@ libdir = @libdir@ mandir = @mandir@ @@ -37,11 +38,9 @@ docdir = $(datadir)/doc/fltk1.1-doc VPATH = @srcdir@ # programs we use... -CHMOD = chmod -CP = cp HTMLDOC = @HTMLDOC@ +INSTALL = @INSTALL@ LN = ln -s -MKDIR = mkdir -p NROFF = @NROFF@ RM = rm -f RMDIR = rm -rf @@ -54,9 +53,10 @@ CC = @CC@ MAKEDEPEND = @MAKEDEPEND@ # flags for C++ compiler: +ARCHFLAGS = @ARCHFLAGS@ OPTIM = @OPTIM@ -CFLAGS = $(OPTIM) @LARGEFILE@ @CPPFLAGS@ @CFLAGS@ -CXXFLAGS = $(OPTIM) @LARGEFILE@ @CPPFLAGS@ @CXXFLAGS@ +CFLAGS = $(OPTIM) @LARGEFILE@ @PTHREAD_FLAGS@ @CPPFLAGS@ @CFLAGS@ +CXXFLAGS = $(OPTIM) @LARGEFILE@ @PTHREAD_FLAGS@ @CPPFLAGS@ @CXXFLAGS@ # program to make the archive: LIBNAME = @LIBNAME@ @@ -74,8 +74,10 @@ DSOCOMMAND = @DSOCOMMAND@ # libraries to link with: AUDIOLIBS = @AUDIOLIBS@ -LDLIBS = @LDFLAGS@ @LIBS@ -GLDLIBS = @LDFLAGS@ @GLLIB@ @LIBS@ +DSOFLAGS = @DSOFLAGS@ +LDFLAGS = $(OPTIM) @LDFLAGS@ +LDLIBS = @LIBS@ +GLDLIBS = @GLLIB@ @LIBS@ LINKFLTK = @LINKFLTK@ LINKFLTKGL = @LINKFLTKGL@ LINKFLTKFORMS = @LINKFLTKFORMS@ @LINKFLTK@ @@ -106,6 +108,17 @@ CAT1EXT = @CAT1EXT@ CAT3EXT = @CAT3EXT@ CAT6EXT = @CAT6EXT@ +# +# Installation programs... +# + +INSTALL_BIN = $(INSTALL) -m 755 +INSTALL_DATA = $(INSTALL) -m 644 +INSTALL_DIR = $(INSTALL) -d +INSTALL_LIB = $(INSTALL) -m 755 +INSTALL_MAN = $(INSTALL) -m 644 +INSTALL_SCRIPT = $(INSTALL) -m 755 + # Additional GUI install/uninstall targets... INSTALL_DESKTOP = @INSTALL_DESKTOP@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@ @@ -114,22 +127,22 @@ 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) .o$(EXEEXT): echo Linking $@... - $(CXX) $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ + $(CXX) $(ARCHFLAGS) $(LDFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ $(POSTBUILD) $@ ../FL/mac.r .c.o: echo Compiling $<... - $(CC) -I.. @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CFLAGS) -c $< + $(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 $< -.man.0 .man.1 .man.3: +.man.0 .man.1 .man.3 .man.6: echo Formatting $<... rm -f $@ $(NROFF) -man $< >$@ @@ -142,5 +155,5 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@ mv t.z $@ # -# End of "$Id: makeinclude.in 4756 2006-01-15 18:36:16Z mike $". +# End of "$Id: makeinclude.in 5800 2007-05-03 15:49:59Z matt $". # |