Applied patch [ 853031 ] Japanese po file

[wxWidgets.git] / samples / makefile.gcc

diff --git a/samples/makefile.gcc b/samples/makefile.gcc
index a0eaffc08aaffc3612d7d5ce76808c981c7138d5..e49df0566913bd2919b806b3de0c386b0cfcc803 100644 (file)
--- a/samples/makefile.gcc
+++ b/samples/makefile.gcc
@@ -12,16 +12,23 @@ include ../build/msw/config.gcc
 
 ### Variables: ###
 
 
 ### Variables: ###
 

+MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" \
+       LDFLAGS="$(LDFLAGS)" CC="$(CC)" USE_GUI="$(USE_GUI)" \
+       MONOLITHIC="$(MONOLITHIC)" CXXFLAGS="$(CXXFLAGS)" \
+       GCC_VERSION="$(GCC_VERSION)" USE_HTML="$(USE_HTML)" BUILD="$(BUILD)" \
+       DEBUG_INFO="$(DEBUG_INFO)" USE_EXCEPTIONS="$(USE_EXCEPTIONS)" \
+       VENDOR="$(VENDOR)" UNICODE="$(UNICODE)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
+       MSLU="$(MSLU)" WXUNIV="$(WXUNIV)" RUNTIME_LIBS="$(RUNTIME_LIBS)" \
+       CXX="$(CXX)" CFG="$(CFG)" CFLAGS="$(CFLAGS)" SHARED="$(SHARED)" \
+       USE_ODBC="$(USE_ODBC)" USE_OPENGL="$(USE_OPENGL)"

 
 ### Conditionally set variables: ###
 
 
 
 ### Conditionally set variables: ###
 
 

-MAKEARGS = GCC_VERSION=$(GCC_VERSION)
-

 
 ### Targets: ###
 
 
 ### Targets: ###
 

-all: access artprov calendar caret checklst config console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi memcheck menu mfc minifram minimal mobile multimon nativdlg newgrid notebook oleauto opengl ownerdrw png printing propsize regtest render richedit rotate sashtest scroll scrollsub shaped sockets splitter statbar tab taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wxtest
+all: access artprov calendar caret checklst config console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi memcheck menu mfc minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png printing propsize regtest render richedit rotate sashtest scroll scrollsub shaped sockets splitter statbar tab taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wxtest

 
 access: 
        $(MAKE) -C access -f makefile.gcc $(MAKEARGS) all
 
 access: 
        $(MAKE) -C access -f makefile.gcc $(MAKEARGS) all


@@ -86,6 +93,9 @@ erase:
 event: 
        $(MAKE) -C event -f makefile.gcc $(MAKEARGS) all
 
 event: 
        $(MAKE) -C event -f makefile.gcc $(MAKEARGS) all
 

+except: 
+       $(MAKE) -C except -f makefile.gcc $(MAKEARGS) all
+

 exec: 
        $(MAKE) -C exec -f makefile.gcc $(MAKEARGS) all
 
 exec: 
        $(MAKE) -C exec -f makefile.gcc $(MAKEARGS) all
 


@@ -155,9 +165,6 @@ multimon:
 nativdlg: 
        $(MAKE) -C nativdlg -f makefile.gcc $(MAKEARGS) all
 
 nativdlg: 
        $(MAKE) -C nativdlg -f makefile.gcc $(MAKEARGS) all
 

-newgrid: 
-       $(MAKE) -C newgrid -f makefile.gcc $(MAKEARGS) all
-

 notebook: 
        $(MAKE) -C notebook -f makefile.gcc $(MAKEARGS) all
 
 notebook: 
        $(MAKE) -C notebook -f makefile.gcc $(MAKEARGS) all
 


@@ -248,4 +255,4 @@ wizard:
 wxtest: 
        $(MAKE) -C wxtest -f makefile.gcc $(MAKEARGS) all
 
 wxtest: 
        $(MAKE) -C wxtest -f makefile.gcc $(MAKEARGS) all
 

-.PHONY: all access artprov calendar caret checklst clean config console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi memcheck menu mfc minifram minimal mobile multimon nativdlg newgrid notebook oleauto opengl ownerdrw png printing propsize regtest render richedit rotate sashtest scroll scrollsub shaped sockets splitter statbar tab taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wxtest
+.PHONY: all access artprov calendar caret checklst clean config console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi memcheck menu mfc minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png printing propsize regtest render richedit rotate sashtest scroll scrollsub shaped sockets splitter statbar tab taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wxtest