highlighting fixes

[wxWidgets.git] / setup / maketmpl.in

diff --git a/setup/maketmpl.in b/setup/maketmpl.in
index 25051c1affc0b6be5bdb942993411b5d98dcd2ee..a97349e8a5f55f13b77ef4ec86ed08f5b4715da4 100644 (file)
--- a/setup/maketmpl.in
+++ b/setup/maketmpl.in
@@ -31,12 +31,13 @@ DEBUG = @WXDEBUG@ @WXDEBUG_DEFINE@
 
 # c-compiler stuff
 CC = @CC@
-CFLAGS = @CFLAGS@ $(OPTIMISE) $(PROFILE) $(DEBUG)
 CPP = @CPP@
+CPPFLAGS=@CPPFLAGS@
+CFLAGS = @CFLAGS@ $(CPPFLAGS) $(OPTIMISE) $(PROFILE) $(DEBUG)
 
 # c++-compiler stuff
 CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@ $(OPTIMISE) $(PROFILE) $(DEBUG)
+CXXFLAGS = @CXXFLAGS@ $(CPPFLAGS) $(OPTIMISE) $(PROFILE) $(DEBUG)
 CXXCPP = @CXXCPP@
 
 # shared compile stuff
@@ -54,25 +55,26 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 AWK = @AWK@
 LN_S = @LN_S@
-CJPEG_PROG = 
+STRIP = @STRIP@
+CJPEG_PROG =
 CONVERT_PATH = /usr/bin/X11
 CONVERT_PROG = /usr/bin/X11/convert
 DJPEG_PROG = 
 GIFTOPNM_PROG = 
 NETPBM_PATH = 
 
+# Base directories for installation
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-# Directory in which to install scripts.
-#bindir = @bindir@
+# Directory in which to install headers
+includedir = @includedir@
 
-# Directory in which to install library files.
-datadir = @datadir@
-acdatadir = $(datadir)/autoconf
+# Directory in which to install library files
+libdir = @libdir@
 
-# Directory in which to install documentation info files.
-infodir = @infodir@
+# Directory in which to install executable files
+bindir = @bindir@
 
 X_CFLAGS = @X_CFLAGS@
 X_LIBS = @X_LIBS@
@@ -83,33 +85,28 @@ GUI_TK_INCLUDE = @GUI_TK_INCLUDE@
 GUI_TK_LIBRARY = @GUI_TK_LIBRARY@
 GUI_TK_LINK = @GUI_TK_LINK@
 
-OPENGL_INCLUDE = @OPENGL_INCLUDE@
-OPENGL_LIBRARY = @OPENGL_LIBRARY@
-OPENGL_LINK = @OPENGL_LINK@
+WX_LINK = @WX_LINK@
 
 THREADS_LINK = @THREADS_LINK@
 EXTRA_LINK = @EXTRA_LINK@
+JPEG_LINK = @JPEG_LINK@
+POSIX4_LINK=@POSIX4_LINK@
 
 # INCLUDES
 WX_INCLUDES = \
+-I$(WXBASEDIR)/src/zlib \
+-I$(WXBASEDIR)/src/png \
+-I$(WXBASEDIR)/src/jpeg \
 $(TOOLKIT_DEF) \
--I. \
--I.. \
 -I$(WXBASEDIR)/include \
--I$(WXBASEDIR)/src/zlib \
+-I. \
 $(GUI_TK_INCLUDE) \
-$(OPENGL_INCLUDE) \
+-I$(WXBASEDIR)/src/iodbc \
 $(X_CFLAGS)
 
-# -I$(WXBASEDIR)/src/png \
-# -I$(WXBASEDIR)/src/zlib \
-# -I$(WXBASEDIR)/src/gdk_imlib \
+WX_LIBS = -L$(GLOBAL_LIB_DIR) $(WX_LINK)
 
-WX_LIBS = -L$(GLOBAL_LIB_DIR) -lwx_gtk
-
-OPENGL_LIBS = $(OPENGL_LIBRARY) $(OPENGL_LINK)
-
-GUI_TK_LIBS = $(GUI_TK_LIBRARY) $(GUI_TK_LINK) -ldl
+GUI_TK_LIBS = $(GUI_TK_LIBRARY) $(GUI_TK_LINK) @DL_LIBRARY@
 
 LINK = $(CXX) -o $@
 LINK_LIBS= \
@@ -118,8 +115,10 @@ LINK_LIBS= \
   $(X_EXTRA_LIBS) \
   $(X_PRE_LIBS) \
   $(THREADS_LINK) \
-  $(EXTRA_LINK)
-  
+  $(POSIX4_LINK) \
+  $(EXTRA_LINK) \
+  $(JPEG_LINK)
+
 # Don't include $(OPENGL_LIBS) in LINK_LIBS; they
 # can be conveniently added to BIN_LINK in Makefile.in.