Minor changes, just trim trailing spaces in webview code.

[wxWidgets.git] / samples / toolbar / makefile.unx

diff --git a/samples/toolbar/makefile.unx b/samples/toolbar/makefile.unx
index b01a514e9bab3970688e1058949067cb170e109c..263a0accb3592c72b16a95181d1fdaf514458d87 100644 (file)
--- a/samples/toolbar/makefile.unx
+++ b/samples/toolbar/makefile.unx
@@ -1,80 +1,100 @@
-#
-# File:                makefile.unx
-# Author:      Julian Smart
-# Created:     1993
-# Updated:     
-# Copyright:   (c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile for wxToolBar example (UNIX).
-# Change the WXDIR directory, and CPPFLAGS and LDFLAGS, for your system.
+# =========================================================================
+#     This makefile was generated by
+#     Bakefile 0.2.9 (http://www.bakefile.org)
+#     Do not modify, all changes will be overwritten!
+# =========================================================================
 
-WXDIR = ../..
 
-# All common UNIX compiler flags and options are now in
-# this central makefile.
-include $(WXDIR)/src/make.env
 
-TOOLBARDIR = $(WXDIR)/samples/toolbar
+# -------------------------------------------------------------------------
+# These are configurable options:
+# -------------------------------------------------------------------------
 
-OBJECTS = $(OBJDIR)/wx_bbar.$(OBJSUFF)
-TESTOBJECTS = $(OBJDIR)/test.$(OBJSUFF)
-TESTPROGRAM = $(TOOLBARDIR)/test$(GUISUFFIX)
+# C++ compiler 
+CXX = `$(WX_CONFIG) --cxx`
 
-LDFLAGS =  $(XLIB) -L$(WXDIR)/lib
+# Standard flags for C++ 
+CXXFLAGS ?= 
 
-XVIEWLDLIBS = -lwx_ol -lxview -lolgx -lX11 -lm $(COMPLIBS)
-MOTIFLDLIBS = -lwx_motif -lXm -lXt -lX11 -lm $(COMPLIBS)
-HPLDLIBS = -lwx_hp -lXm -lXt -lX11 -lm $(HPCOMPLIBS)
-# Default
-LDLIBS=$(XVIEWLDLIBS)
+# Standard preprocessor flags (common for CC and CXX) 
+CPPFLAGS ?= 
 
-all:   $(OBJDIR) $(TESTPROGRAM)
+# Standard linker flags 
+LDFLAGS ?= 
 
-demo:  $(TESTPROGRAM)
+# Location and arguments of wx-config script 
+WX_CONFIG ?= wx-config
 
-.SUFFIXES:
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
+WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
-wx:
-       cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx GUI=$(GUI)
+# Use DLL build of wx library to use? [0,1]
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --query-linkage`; then echo 1; else echo 0; fi)
 
-motif:
-       cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx motif OPT='$(OPT)'
-       $(MAKE) -f makefile.unx GUI=-Dwx_motif GUISUFFIX=_motif OPT='$(OPT)' LDLIBS='$(MOTIFLDLIBS)' XVIEW_LINK=
+# Compile Unicode build of wxWidgets? [0,1]
+WX_UNICODE ?= $(shell $(WX_CONFIG) --query-chartype | sed 's/unicode/1/;s/ansi/0/')
 
-demo_motif:
-       $(MAKE) -f makefile.unx all demo GUI=-Dwx_motif GUISUFFIX=_motif OPT='$(OPT)' LDLIBS='$(MOTIFLDLIBS)' XVIEW_LINK=
+# Version of the wx library to build against. 
+WX_VERSION ?= $(shell $(WX_CONFIG) --query-version | sed -e 's/\([0-9]*\)\.\([0-9]*\)/\1\2/')
 
-xview:
-       cd $(WXDIR)/src/x; $(MAKE) -f makefile.unx xview OPT='$(OPT)'
-       $(MAKE) -f makefile.unx GUI=-Dwx_xview OPT='$(OPT)'
 
-demo_ol:
-       $(MAKE) -f makefile.unx all demo GUI=-Dwx_xview OPT='$(OPT)'
 
-hp:
-       $(MAKE) -f makefile.unx GUI=-Dwx_motif GUISUFFIX=_hp CC=CC DEBUG='$(DEBUG)' OPT='' WARN='-w' \
-           XINCLUDE='$(HPXINCLUDE)' XLIB='$(HPXLIB)' XVIEW_LINK='' CCLEX='cc' \
-           LDLIBS='$(HPLDLIBS)'
-$(OBJDIR):
-       mkdir $(OBJDIR)
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
 
-$(OBJDIR)/test.$(OBJSUFF):             test.h test.$(SRCSUFF)
-       $(CC) -c $(CPPFLAGS) -o $@ test.$(SRCSUFF)
+### Variables: ###
 
-$(TESTPROGRAM): $(OBJDIR)/test.$(OBJSUFF) $(WXLIB)
-       $(CC) $(LDFLAGS) -o test$(GUISUFFIX) $(OBJDIR)/test.$(OBJSUFF) $(XVIEW_LINK) $(LDLIBS)
+CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP
+WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1)
+WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2)
+WX_CONFIG_FLAGS = $(WX_CONFIG_UNICODE_FLAG) $(WX_CONFIG_SHARED_FLAG) \
+       --toolkit=$(WX_PORT) --version=$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
+TOOLBAR_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
+       $(CXXFLAGS)
+TOOLBAR_OBJECTS =  \
+       toolbar_toolbar.o
 
-cleaneach:
-       rm -f $(OBJECTS) test$(GUISUFFIX) $(OBJDIR)/test.$(OBJSUFF) core
+### Conditionally set variables: ###
 
-clean_motif:
-       $(MAKE) -f makefile.unx GUISUFFIX=_motif cleaneach 
+ifeq ($(WX_UNICODE),0)
+WX_CONFIG_UNICODE_FLAG = --unicode=no
+endif
+ifeq ($(WX_UNICODE),1)
+WX_CONFIG_UNICODE_FLAG = --unicode=yes
+endif
+ifeq ($(WX_SHARED),0)
+WX_CONFIG_SHARED_FLAG = --static=yes
+endif
+ifeq ($(WX_SHARED),1)
+WX_CONFIG_SHARED_FLAG = --static=no
+endif
 
-clean_ol:
-       $(MAKE) -f makefile.unx GUISUFFIX=_ol cleaneach 
 
-clean_hp:
-       $(MAKE) -f makefile.unx GUISUFFIX=_hp cleaneach 
+### Targets: ###
 
+all: test_for_selected_wxbuild toolbar
+
+install: 
+
+uninstall: 
+
+clean: 
+       rm -f ./*.o
+       rm -f ./*.d
+       rm -f toolbar
+
+test_for_selected_wxbuild: 
+       @$(WX_CONFIG) $(WX_CONFIG_FLAGS)
+
+toolbar: $(TOOLBAR_OBJECTS)
+       $(CXX) -o $@ $(TOOLBAR_OBJECTS)   $(LDFLAGS)  `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base`
+
+toolbar_toolbar.o: ./toolbar.cpp
+       $(CXX) -c -o $@ $(TOOLBAR_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all install uninstall clean
+
+
+# Dependencies tracking:
+-include ./*.d