X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77a7dfc1a1716e4815ce8bce13381bfd3e6da331..f5766910b6731eb03e82371416e9778203396ce7:/samples/dialup/Makefile.in diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in index 5b492e197f..e59c166478 100644 --- a/samples/dialup/Makefile.in +++ b/samples/dialup/Makefile.in @@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ DESTDIR = WX_RELEASE = 2.7 -WX_VERSION = $(WX_RELEASE).0 +WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(top_builddir)lib NETTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ @@ -63,6 +63,7 @@ NETTEST_OBJECTS = \ @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) @COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = +@COND_PLATFORM_MSDOS_0@__nettest___depname = nettest$(EXEEXT) @COND_PLATFORM_MAC_1@__nettest___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -a C nettest$(EXEEXT) @COND_PLATFORM_MAC_1@__nettest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) @@ -132,7 +133,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \ ### Targets: ### -all: nettest$(EXEEXT) $(__nettest_bundle___depname) +all: $(__nettest___depname) $(__nettest_bundle___depname) install: all @@ -149,14 +150,14 @@ clean: distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -nettest$(EXEEXT): $(NETTEST_OBJECTS) $(__nettest___win32rc) - $(CXX) -o $@ $(NETTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) - $(__nettest___mac_rezcmd) - $(__nettest___mac_setfilecmd) - $(__nettest___os2_emxbindcmd) - $(SAMPLES_RPATH_POSTLINK) +@COND_PLATFORM_MSDOS_0@nettest$(EXEEXT): $(NETTEST_OBJECTS) $(__nettest___win32rc) +@COND_PLATFORM_MSDOS_0@ $(CXX) -o $@ $(NETTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) +@COND_PLATFORM_MSDOS_0@ $(__nettest___mac_rezcmd) +@COND_PLATFORM_MSDOS_0@ $(__nettest___mac_setfilecmd) +@COND_PLATFORM_MSDOS_0@ $(__nettest___os2_emxbindcmd) +@COND_PLATFORM_MSDOS_0@ $(SAMPLES_RPATH_POSTLINK) -nettest.app/Contents/PkgInfo: nettest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns +nettest.app/Contents/PkgInfo: $(__nettest___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns mkdir -p nettest.app/Contents mkdir -p nettest.app/Contents/MacOS mkdir -p nettest.app/Contents/Resources