fix sizing of extra control

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

diff --git a/samples/exec/makefile.unx b/samples/exec/makefile.unx
index 27006b932a037b740f3e0e653d0004c6a116f9cf..80ec2c35588bfeb79bc1442443b1fc06837ac87a 100644 (file)
--- a/samples/exec/makefile.unx
+++ b/samples/exec/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.3 (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,$(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)]
-WX_PORT = $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
+# 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)

 
 

-# Use DLL build of wx library to use? [0,1,$(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)
+# 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)

 
 

-# Compile Unicode build of wxWidgets? [0,1,$(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/')
+# 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/')

 
 

-# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1,$(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/')
+# 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/')

 
 # 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/')

 
 
 
 
 
 


@@ -98,7 +98,7 @@ test_for_selected_wxbuild:
        @$(WX_CONFIG) $(WX_CONFIG_FLAGS)
 
 exec: $(EXEC_OBJECTS)
        @$(WX_CONFIG) $(WX_CONFIG_FLAGS)
 
 exec: $(EXEC_OBJECTS)

-       $(CXX) -o $@ $(EXEC_OBJECTS) $(LDFLAGS)   `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base`
+       $(CXX) -o $@ $(EXEC_OBJECTS) $(LDFLAGS)  `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base`

 
 exec_exec.o: ./exec.cpp
        $(CXX) -c -o $@ $(EXEC_CXXFLAGS) $(CPPDEPS) $<
 
 exec_exec.o: ./exec.cpp
        $(CXX) -c -o $@ $(EXEC_CXXFLAGS) $(CPPDEPS) $<