Remove remaining occurrences of wxUSE_XPM_IN_MSW.

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

diff --git a/samples/calendar/makefile.unx b/samples/calendar/makefile.unx
index c2fff781f2c6426a88215451f358b29457837851..09eb3c65c5b3b137dcad5519aee920f99b10382d 100644 (file)
--- a/samples/calendar/makefile.unx
+++ b/samples/calendar/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.9 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -11,34 +11,31 @@
 # -------------------------------------------------------------------------
 
 # C++ compiler 
-CXX = g++
+CXX = `$(WX_CONFIG) --cxx`
 
 # Standard flags for C++ 
-CXXFLAGS = 
+CXXFLAGS ?= 
 
 # Standard preprocessor flags (common for CC and CXX) 
-CPPFLAGS = 
+CPPFLAGS ?= 
 
 # Standard linker flags 
-LDFLAGS = 
+LDFLAGS ?= 
 
 # 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,osx_cocoa,osx_carbon,dfb]
+WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
-# 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) --query-linkage`; 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/')
-
-# 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/')
+# Compile Unicode build of wxWidgets? [0,1]
+WX_UNICODE ?= $(shell $(WX_CONFIG) --query-chartype | sed 's/unicode/1/;s/ansi/0/')
 
 # 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) --query-version | sed -e 's/\([0-9]*\)\.\([0-9]*\)/\1\2/')
 
 
 
@@ -48,12 +45,11 @@ WX_VERSION = $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\
 
 ### 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_CONFIG_SHARED_FLAG) --toolkit=$(WX_PORT) \
-       --version=$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
+WX_CONFIG_FLAGS = $(WX_CONFIG_UNICODE_FLAG) $(WX_CONFIG_SHARED_FLAG) \
+       --toolkit=$(WX_PORT) --version=$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
 CALENDAR_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
        $(CXXFLAGS)
 CALENDAR_OBJECTS =  \
@@ -61,12 +57,6 @@ CALENDAR_OBJECTS =  \
 
 ### Conditionally set variables: ###
 
-ifeq ($(WX_DEBUG),0)
-WX_CONFIG_DEBUG_FLAG = --debug=no
-endif
-ifeq ($(WX_DEBUG),1)
-WX_CONFIG_DEBUG_FLAG = --debug=yes
-endif
 ifeq ($(WX_UNICODE),0)
 WX_CONFIG_UNICODE_FLAG = --unicode=no
 endif
@@ -85,7 +75,7 @@ endif
 
 all: test_for_selected_wxbuild calendar
 
-install: all
+install: 
 
 uninstall: 
 
@@ -98,7 +88,7 @@ test_for_selected_wxbuild:
        @$(WX_CONFIG) $(WX_CONFIG_FLAGS)
 
 calendar: $(CALENDAR_OBJECTS)
-       $(CXX) -o $@ $(CALENDAR_OBJECTS) $(LDFLAGS)   `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,html,xml,core,base`
+       $(CXX) -o $@ $(CALENDAR_OBJECTS)   $(LDFLAGS)  `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base`
 
 calendar_calendar.o: ./calendar.cpp
        $(CXX) -c -o $@ $(CALENDAR_CXXFLAGS) $(CPPDEPS) $<