X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/75a0a7b7de0cb3d5645ec014b60431b5fa2c7095..1e52188741389278cd99abf79218162c87024ba3:/samples/typetest/Makefile.in diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in index 7cfe235d9a..e2281f7aa5 100644 --- a/samples/typetest/Makefile.in +++ b/samples/typetest/Makefile.in @@ -13,7 +13,6 @@ INSTALL = @INSTALL@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ -EXEEXT = @EXEEXT@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -44,8 +43,6 @@ WX_VERSION = 2.5.0 ### Conditionally set variables: ### -@COND_DEPS_TRACKING_0@CXXC = $(CXX) -@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_TOOLKIT_MAC@WXBASEPORT = _carbon @@ -75,7 +72,7 @@ WX_VERSION = 2.5.0 @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o typetest$(EXEEXT) Carbon.r \ + $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o typetest Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -90,19 +87,18 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_PLATFORM_MAC_1@__typetest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__typetest___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C typetest$(EXEEXT) +@COND_PLATFORM_MAC_1@__typetest___mac_setfilecmd = $(SETFILE) -a C typetest @COND_PLATFORM_WIN32_1@__typetest___win32rc = typetest_typetest_rc.o @COND_PLATFORM_MACOSX_1@__typetest_bundle___depname = typetest_bundle ### Targets: ### -all: typetest$(EXEEXT) $(__typetest_bundle___depname) +all: typetest $(__typetest_bundle___depname) clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f typetest$(EXEEXT) + rm -f typetest rm -rf typetest.app distclean: clean @@ -112,13 +108,13 @@ install: all install-strip: install -typetest$(EXEEXT): $(TYPETEST_OBJECTS) $(__typetest___win32rc) +typetest: $(TYPETEST_OBJECTS) $(__typetest___win32rc) $(CXX) -o $@ $(TYPETEST_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) $(EXTRALIBS_GUI) $(__typetest___mac_rezcmd) $(__typetest___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -typetest.app/Contents: typetest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns +typetest.app/Contents: typetest $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns mkdir -p typetest.app/Contents mkdir -p typetest.app/Contents/MacOS mkdir -p typetest.app/Contents/Resources @@ -133,7 +129,7 @@ typetest.app/Contents: typetest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L echo -n "APPL????" >typetest.app/Contents/PkgInfo - ln -f typetest$(EXEEXT) typetest.app/Contents/MacOS/typetest + ln -f typetest typetest.app/Contents/MacOS/typetest ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc typetest.app/Contents/Resources/typetest.rsrc @@ -142,7 +138,7 @@ typetest.app/Contents: typetest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L @COND_PLATFORM_MACOSX_1@typetest_bundle: typetest.app/Contents typetest_typetest.o: $(srcdir)/typetest.cpp - $(CXXC) -c -o $@ $(TYPETEST_CXXFLAGS) $< + $(CXX) -c -o $@ $(TYPETEST_CXXFLAGS) $< typetest_typetest_rc.o: $(srcdir)/typetest.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples