replaced all occurences of wxColourDatabase::FindColour() with Find(); minor code...

[wxWidgets.git] / contrib / src / gizmos / Makefile.in

diff --git a/contrib/src/gizmos/Makefile.in b/contrib/src/gizmos/Makefile.in
index 568eb38a47a5c0698a6609acb625d6159b0e9578..4b8460f2e5c91b971129dd2768722575be922330 100644 (file)
--- a/contrib/src/gizmos/Makefile.in
+++ b/contrib/src/gizmos/Makefile.in
@@ -42,9 +42,10 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
-GIZMOSDLL_CXXFLAGS = $(__gizmosdll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+DESTDIR = 
+GIZMOSDLL_CXXFLAGS = $(__gizmosdll_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \
-       -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS $(CXXFLAGS) $(PIC_FLAG)
+       -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
 GIZMOSDLL_OBJECTS =  \
        gizmosdll_dynamicsash.o \
        gizmosdll_editlbox.o \
@@ -52,9 +53,9 @@ GIZMOSDLL_OBJECTS =  \
        gizmosdll_multicell.o \
        gizmosdll_splittree.o \
        gizmosdll_statpict.o
-GIZMOSLIB_CXXFLAGS = $(__gizmoslib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+GIZMOSLIB_CXXFLAGS = $(__gizmoslib_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \
-       $(CXXFLAGS)
+       $(CPPFLAGS) $(CXXFLAGS)
 GIZMOSLIB_OBJECTS =  \
        gizmoslib_dynamicsash.o \
        gizmoslib_editlbox.o \
@@ -237,26 +238,26 @@ gizmoslib_statpict.o: $(srcdir)/statpict.cpp
        $(CXXC) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $<
 
 install: all $(__install_gizmosdll___depname) $(__install_gizmoslib___depname)
-       $(INSTALL_DIR) $(includedir)
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)
        for f in wx/gizmos/dynamicsash.h wx/gizmos/editlbox.h wx/gizmos/ledctrl.h wx/gizmos/multicell.h wx/gizmos/splittree.h wx/gizmos/statpict.h wx/gizmos/gizmos.h; do \
-       if test ! -d $(includedir)/`dirname $$f` ; then \
-       $(INSTALL_DIR) $(includedir)/`dirname $$f`; \
+       if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
        fi; \
-       $(INSTALL_DATA) $(srcdir)/../../include//$$f $(includedir)/$$f; \
+       $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
        done
 
 install-strip: install
-       $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3)
 
 @COND_SHARED_1@install_gizmosdll: 
-@COND_SHARED_1@        $(INSTALL_DIR) $(libdir)
-@COND_SHARED_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
-@COND_SHARED_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) $(libdir)
-@COND_SHARED_1@        (cd $(libdir) ; $(__gizmosdll___so_symlinks_inst_cmd))
+@COND_SHARED_1@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
+@COND_SHARED_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__gizmosdll___so_symlinks_inst_cmd))
 
 @COND_SHARED_0@install_gizmoslib: 
-@COND_SHARED_0@        $(INSTALL_DIR) $(libdir)
-@COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).a $(libdir)
+@COND_SHARED_0@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 uninstall: