Fixed the code to actually work.

[wxWidgets.git] / contrib / utils / convertrc / Makefile.in

diff --git a/contrib/utils/convertrc/Makefile.in b/contrib/utils/convertrc/Makefile.in
index b195b9c628b6f3137dbd88e4f8991a60e6f940d9..d5efdd43f50c3c66181c941da25cca8534c0f2a5 100644 (file)
--- a/contrib/utils/convertrc/Makefile.in
+++ b/contrib/utils/convertrc/Makefile.in
@@ -22,6 +22,7 @@ INSTALL_DIR = @INSTALL_DIR@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@

+NM = @NM@

 RESCOMP = @RESCOMP@
 SETFILE = @SETFILE@
 STRIP = @STRIP@
 RESCOMP = @RESCOMP@
 SETFILE = @SETFILE@
 STRIP = @STRIP@


@@ -36,15 +37,18 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-CONVERTRC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+CONVERTRC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \

        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \

-       -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CXXFLAGS)
+       -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \
+       $(CXXFLAGS)

 CONVERTRC_OBJECTS =  \
 CONVERTRC_OBJECTS =  \

+       $(__convertrc_os2_lib_res) \

        convertrc_convert.o \
        convertrc_rc2wxr.o \
        convertrc_rc2xml.o \
        convertrc_wxr2xml.o \
        $(__convertrc___win32rc)
        convertrc_convert.o \
        convertrc_rc2wxr.o \
        convertrc_rc2xml.o \
        convertrc_wxr2xml.o \
        $(__convertrc___win32rc)

+DESTDIR = 

 LIBDIRNAME = $(top_builddir)lib
 
 ### Conditionally set variables: ###
 LIBDIRNAME = $(top_builddir)lib
 
 ### Conditionally set variables: ###


@@ -81,7 +85,7 @@ LIBDIRNAME = $(top_builddir)lib
 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 -i $(srcdir)/../../include -o \
 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 -i $(srcdir)/../../include -o \

-       convertrc$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+       convertrc$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r \

        sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
        sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \


@@ -100,7 +104,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__convertrc___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__convertrc___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C convertrc$(EXEEXT)
 @COND_PLATFORM_MAC_1@__convertrc___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__convertrc___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C convertrc$(EXEEXT)

+COND_PLATFORM_OS2_1___convertrc___os2_emxbindcmd = $(NM) convertrc$(EXEEXT) | \
+       if grep -q pmwin.763 ; then emxbind -ep convertrc$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__convertrc___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___convertrc___os2_emxbindcmd)

 @COND_PLATFORM_WIN32_1@__convertrc___win32rc = convertrc_wxconvert_rc.o
 @COND_PLATFORM_WIN32_1@__convertrc___win32rc = convertrc_wxconvert_rc.o

+@COND_PLATFORM_OS2_1@__convertrc_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res

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


@@ -112,9 +121,10 @@ clean:
        rm -f convertrc$(EXEEXT)
 
 convertrc$(EXEEXT): $(CONVERTRC_OBJECTS) $(__convertrc___win32rc)
        rm -f convertrc$(EXEEXT)
 
 convertrc$(EXEEXT): $(CONVERTRC_OBJECTS) $(__convertrc___win32rc)

-       $(CXX) -o $@ $(CONVERTRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  $(__WXLIB_CORE_p)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)
+       $(CXX) -o $@ $(CONVERTRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__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)

        $(__convertrc___mac_rezcmd)
        $(__convertrc___mac_setfilecmd)
        $(__convertrc___mac_rezcmd)
        $(__convertrc___mac_setfilecmd)

+       $(__convertrc___os2_emxbindcmd)

 
 convertrc_convert.o: $(srcdir)/convert.cpp
        $(CXXC) -c -o $@ $(CONVERTRC_CXXFLAGS) $<
 
 convertrc_convert.o: $(srcdir)/convert.cpp
        $(CXXC) -c -o $@ $(CONVERTRC_CXXFLAGS) $<


@@ -126,7 +136,7 @@ convertrc_rc2xml.o: $(srcdir)/rc2xml.cpp
        $(CXXC) -c -o $@ $(CONVERTRC_CXXFLAGS) $<
 
 convertrc_wxconvert_rc.o: $(srcdir)/wxconvert.rc
        $(CXXC) -c -o $@ $(CONVERTRC_CXXFLAGS) $<
 
 convertrc_wxconvert_rc.o: $(srcdir)/wxconvert.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 --include-dir $(srcdir)/../../include
+       $(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 --include-dir $(srcdir)/../../include

 
 convertrc_wxr2xml.o: $(srcdir)/wxr2xml.cpp
        $(CXXC) -c -o $@ $(CONVERTRC_CXXFLAGS) $<
 
 convertrc_wxr2xml.o: $(srcdir)/wxr2xml.cpp
        $(CXXC) -c -o $@ $(CONVERTRC_CXXFLAGS) $<


@@ -137,11 +147,11 @@ distclean: clean
 install: all install_convertrc
 
 install-strip: install
 install: all install_convertrc
 
 install-strip: install

-       $(STRIP) $(bindir)/convertrc$(EXEEXT)
+       $(STRIP) $(DESTDIR)$(bindir)/convertrc$(EXEEXT)

 
 install_convertrc: 
 
 install_convertrc: 

-       $(INSTALL_DIR) $(bindir)
-       $(INSTALL_PROGRAM) convertrc$(EXEEXT) $(bindir)
+       $(INSTALL_DIR) $(DESTDIR)$(bindir)
+       $(INSTALL_PROGRAM) convertrc$(EXEEXT) $(DESTDIR)$(bindir)

 
 uninstall: 
 
 
 uninstall: