From 40d57a33deae90e0ebc6ad03eeeed824eaf175ee Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Sun, 30 Sep 2018 14:55:43 +0200 Subject: [PATCH] Remove remnants of OS/2 from build system --- autoconf_inc.m4 | 6 ------ configure | 6 ------ samples/dialogs/Makefile.in | 8 -------- 3 files changed, 20 deletions(-) diff --git a/autoconf_inc.m4 b/autoconf_inc.m4 index f3156ae24a..8367cfdd6d 100644 --- a/autoconf_inc.m4 +++ b/autoconf_inc.m4 @@ -530,12 +530,6 @@ dnl ### begin block 20_COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0[../../samples/dialogs/ COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0="" fi AC_SUBST(COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0) -dnl ### begin block 20_COND_SHARED_0_TOOLKIT_PM_WXUNIV_0[../../samples/dialogs/dialogs.bkl] ### - COND_SHARED_0_TOOLKIT_PM_WXUNIV_0="#" - if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xPM" -a "x$WXUNIV" = "x0" ; then - COND_SHARED_0_TOOLKIT_PM_WXUNIV_0="" - fi - AC_SUBST(COND_SHARED_0_TOOLKIT_PM_WXUNIV_0) dnl ### begin block 20_COND_SHARED_0_USE_GUI_1_USE_OPENGL_1[wx.bkl] ### COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#" if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then diff --git a/configure b/configure index 47205af945..2cb0841699 100755 --- a/configure +++ b/configure @@ -745,7 +745,6 @@ COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 -COND_SHARED_0_TOOLKIT_PM_WXUNIV_0 COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0 COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0 COND_SHARED_0 @@ -41107,11 +41106,6 @@ EOF COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0="" fi - COND_SHARED_0_TOOLKIT_PM_WXUNIV_0="#" - if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xPM" -a "x$WXUNIV" = "x0" ; then - COND_SHARED_0_TOOLKIT_PM_WXUNIV_0="" - fi - COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#" if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="" diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in index 83eea46a3c..f9e618bff3 100644 --- a/samples/dialogs/Makefile.in +++ b/samples/dialogs/Makefile.in @@ -106,8 +106,6 @@ COND_PLATFORM_OS2_1___dialogs___os2_emxbindcmd = $(NM) dialogs$(EXEEXT) | if \ @COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0@ dialogs_filedlgg.o @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS \ @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = dialogs_filedlgg.o -@COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@__GENERIC_DIALOGS_IN_NATIVE_BUILDS_OBJECTS \ -@COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@ = dialogs_fontdlgg.o dialogs_filedlgg.o COND_MONOLITHIC_0___WXLIB_CORE_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) @@ -221,16 +219,10 @@ dialogs_dialogs.o: $(srcdir)/dialogs.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@dialogs_filedlgg.o: $(srcdir)/../../src/generic/filedlgg.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/filedlgg.cpp -@COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@dialogs_filedlgg.o: $(srcdir)/../../src/generic/filedlgg.cpp -@COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@ $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/filedlgg.cpp @COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@dialogs_fontdlgg.o: $(srcdir)/../../src/generic/fontdlgg.cpp @COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@ $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/fontdlgg.cpp -@COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@dialogs_fontdlgg.o: $(srcdir)/../../src/generic/fontdlgg.cpp -@COND_SHARED_0_TOOLKIT_PM_WXUNIV_0@ $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/fontdlgg.cpp - - # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d