Fixed drawing of the lines data, also ensure that only tuples are

[wxWidgets.git] / utils / wxrc / Makefile.in

diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in
index 542a5259cb8f67762e54b830577b3308dd31282f..7455957c7b0a41ca46bb81b41074f7cca5b9c621 100644 (file)
--- a/utils/wxrc/Makefile.in
+++ b/utils/wxrc/Makefile.in
@@ -13,10 +13,13 @@ INSTALL = @INSTALL@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
+EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 EXTRALIBS_XML = @EXTRALIBS_XML@
 HOST_SUFFIX = @HOST_SUFFIX@
+INSTALL_DIR = @INSTALL_DIR@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 LDFLAGS = @LDFLAGS@
 SETFILE = @SETFILE@
 STRIP = @STRIP@
@@ -30,14 +33,17 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-WXRC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS)
+WXRC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
+       $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS)
 WXRC_OBJECTS =  \
        wxrc_wxrc.o
 
 ### 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
@@ -71,16 +77,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_MONOLITHIC_0@__WXLIB_XML_p = \
 @COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_PLATFORM_MAC_1@__wxrc___mac_setfilecmd = $(SETFILE) -t APPL wxrc
+@COND_PLATFORM_MAC_1@__wxrc___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@  $(SETFILE) -t APPL wxrc$(EXEEXT)
 
 ### Targets: ###
 
-all: wxrc
+all: wxrc$(EXEEXT)
 
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o
-       rm -f wxrc
+       rm -f wxrc$(EXEEXT)
 
 distclean: clean
        rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@@ -88,21 +95,21 @@ distclean: clean
 install: all install_wxrc
 
 install-strip: install
-       $(STRIP) $(bindir)/wxrc
+       $(STRIP) $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
 
 install_wxrc: 
-       $(INSTALL) -d $(bindir)
-       install -c wxrc $(bindir)
+       $(INSTALL_DIR) $(DESTDIR)$(bindir)
+       $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
 
 uninstall: 
 
-wxrc: $(WXRC_OBJECTS)
-       $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(EXTRALIBS_XML) $(__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)
+wxrc$(EXEEXT): $(WXRC_OBJECTS)
+       $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
        
        $(__wxrc___mac_setfilecmd)
 
 wxrc_wxrc.o: $(srcdir)/wxrc.cpp
-       $(CXX) -c -o $@ $(WXRC_CXXFLAGS) $<
+       $(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $<
 
 
 # Include dependency info, if present: