more order in wxCRT_filefunctions: define A and W versions, just as for everything...

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

diff --git a/samples/dialogs/makefile.unx b/samples/dialogs/makefile.unx
index c91c5a345360b50141d012b262d5f2dafebf272d..93ba87eeffcd25d00b0e27fad18088314b56c8d3 100644 (file)
--- a/samples/dialogs/makefile.unx
+++ b/samples/dialogs/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.6 (http://www.bakefile.org)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -11,34 +11,34 @@
 # -------------------------------------------------------------------------
 
 # C++ compiler 
 # -------------------------------------------------------------------------
 
 # C++ compiler 

-CXX := g++
+CXX = g++

 
 # Standard flags for C++ 
 
 # Standard flags for C++ 

-CXXFLAGS := 
+CXXFLAGS ?= 

 
 # Standard preprocessor flags (common for CC and CXX) 
 
 # Standard preprocessor flags (common for CC and CXX) 

-CPPFLAGS := 
+CPPFLAGS ?= 

 
 # Standard linker flags 
 
 # Standard linker flags 

-LDFLAGS := 
+LDFLAGS ?= 

 
 # Location and arguments of wx-config script 
 
 # Location and arguments of wx-config script 

-WX_CONFIG := wx-config
+WX_CONFIG ?= wx-config

 
 # Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
 
 # Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]

-WX_PORT := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)

 
 # Use DLL build of wx library to use? [0,1]
 
 # Use DLL build of wx library to use? [0,1]

-WX_SHARED := $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)

 
 # Compile Unicode build of wxWidgets? [0,1]
 
 # Compile Unicode build of wxWidgets? [0,1]

-WX_UNICODE := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
+WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')

 
 # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
 
 # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]

-WX_DEBUG := $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
+WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')

 
 # Version of the wx library to build against. 
 
 # Version of the wx library to build against. 

-WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
+WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')

 
 
 
 
 
 


@@ -48,7 +48,7 @@ WX_VERSION := $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD
+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_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \
 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_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \


@@ -85,7 +85,7 @@ endif
 
 all: test_for_selected_wxbuild dialogs
 
 
 all: test_for_selected_wxbuild dialogs
 

-install: all
+install: 

 
 uninstall: 
 
 
 uninstall: 
 


@@ -98,7 +98,7 @@ test_for_selected_wxbuild:
        @$(WX_CONFIG) $(WX_CONFIG_FLAGS)
 
 dialogs: $(DIALOGS_OBJECTS)
        @$(WX_CONFIG) $(WX_CONFIG_FLAGS)
 
 dialogs: $(DIALOGS_OBJECTS)

-       $(CXX) -o $@ $(DIALOGS_OBJECTS) $(LDFLAGS)  `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,html,xml,core,base`
+       $(CXX) -o $@ $(DIALOGS_OBJECTS)   $(LDFLAGS)  `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base`

 
 dialogs_dialogs.o: ./dialogs.cpp
        $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<
 
 dialogs_dialogs.o: ./dialogs.cpp
        $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<