Cleaned up some comments, reorganized some code

[wxWidgets.git] / contrib / build / deprecated / makefile.gcc

diff --git a/contrib/build/deprecated/makefile.gcc b/contrib/build/deprecated/makefile.gcc
index ed3df0349c0d2b33edb7dbc2bfe3c67e87578877..19cbfb867a30624a792ea4e6467096cba0db495a 100644 (file)
--- a/contrib/build/deprecated/makefile.gcc
+++ b/contrib/build/deprecated/makefile.gcc
@@ -15,75 +15,60 @@ include ../../../build/msw/config.gcc
 DEPRECATEDDLL_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \
-       -I$(LIBDIRNAME) -I..\..\src\deprecated\..\..\..\src\tiff \
-       -I..\..\src\deprecated\..\..\..\src\jpeg \
-       -I..\..\src\deprecated\..\..\..\src\png \
-       -I..\..\src\deprecated\..\..\..\src\zlib \
-       -I..\..\src\deprecated\..\..\..\src\regex \
-       -I..\..\src\deprecated\..\..\..\src\expat\lib \
-       -I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \
-       $(CFLAGS)
+       -I$(SETUPHDIR) -I..\..\src\deprecated\..\..\include -DWXUSINGDLL \
+       -DWXMAKINGDLL_DEPRECATED -I..\..\src\deprecated $(CFLAGS)
 DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
        $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       -I..\..\src\deprecated\..\..\..\include -I$(LIBDIRNAME) \
-       -I..\..\src\deprecated\..\..\..\src\tiff \
-       -I..\..\src\deprecated\..\..\..\src\jpeg \
-       -I..\..\src\deprecated\..\..\..\src\png \
-       -I..\..\src\deprecated\..\..\..\src\zlib \
-       -I..\..\src\deprecated\..\..\..\src\regex \
-       -I..\..\src\deprecated\..\..\..\src\expat\lib \
+       -I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) \
        -I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \
-       $(CXXFLAGS)
+       -I..\..\src\deprecated $(CXXFLAGS)
 DEPRECATEDDLL_OBJECTS =  \
        $(OBJS)\deprecateddll_dummy.o \
        $(OBJS)\deprecateddll_prop.o \
        $(OBJS)\deprecateddll_propform.o \
        $(OBJS)\deprecateddll_proplist.o \
        $(OBJS)\deprecateddll_resource.o \
+       $(OBJS)\deprecateddll_tbarsmpl.o \
        $(OBJS)\deprecateddll_treelay.o \
        $(OBJS)\deprecateddll_wxexpr.o \
        $(OBJS)\deprecateddll_dosyacc.o
 DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \
-       -I$(LIBDIRNAME) -I..\..\src\deprecated\..\..\..\src\tiff \
-       -I..\..\src\deprecated\..\..\..\src\jpeg \
-       -I..\..\src\deprecated\..\..\..\src\png \
-       -I..\..\src\deprecated\..\..\..\src\zlib \
-       -I..\..\src\deprecated\..\..\..\src\regex \
-       -I..\..\src\deprecated\..\..\..\src\expat\lib \
-       -I..\..\src\deprecated\..\..\include $(CFLAGS)
+       -I$(SETUPHDIR) -I..\..\src\deprecated\..\..\include -I..\..\src\deprecated \
+       $(CFLAGS)
 DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
        $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       -I..\..\src\deprecated\..\..\..\include -I$(LIBDIRNAME) \
-       -I..\..\src\deprecated\..\..\..\src\tiff \
-       -I..\..\src\deprecated\..\..\..\src\jpeg \
-       -I..\..\src\deprecated\..\..\..\src\png \
-       -I..\..\src\deprecated\..\..\..\src\zlib \
-       -I..\..\src\deprecated\..\..\..\src\regex \
-       -I..\..\src\deprecated\..\..\..\src\expat\lib \
-       -I..\..\src\deprecated\..\..\include $(CXXFLAGS)
+       -I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) \
+       -I..\..\src\deprecated\..\..\include -I..\..\src\deprecated $(CXXFLAGS)
 DEPRECATEDLIB_OBJECTS =  \
        $(OBJS)\deprecatedlib_dummy.o \
        $(OBJS)\deprecatedlib_prop.o \
        $(OBJS)\deprecatedlib_propform.o \
        $(OBJS)\deprecatedlib_proplist.o \
        $(OBJS)\deprecatedlib_resource.o \
+       $(OBJS)\deprecatedlib_tbarsmpl.o \
        $(OBJS)\deprecatedlib_treelay.o \
        $(OBJS)\deprecatedlib_wxexpr.o \
        $(OBJS)\deprecatedlib_dosyacc.o
-LIBDIRNAME = \
-       ..\..\src\deprecated\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 
 ### Conditionally set variables: ###
 
 ifeq ($(GCC_VERSION),2.95)
 GCCFLAGS = -fvtable-thunks
 endif
+ifeq ($(SHARED),0)
+LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\gcc_lib$(CFG)
+endif
+ifeq ($(SHARED),1)
+LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\gcc_dll$(CFG)
+endif
 ifeq ($(USE_GUI),0)
 PORTNAME = base
 endif
@@ -190,52 +175,58 @@ $(OBJS):
 
 all: $(__deprecateddll___depname) $(__deprecatedlib___depname)
 
-$(OBJS)\deprecateddll_dosyacc.o: ../../src/deprecated\dosyacc.c
+$(OBJS)\deprecateddll_dosyacc.o: ../../src/deprecated/dosyacc.c
        $(CC) -c -o $@ $(DEPRECATEDDLL_CFLAGS) $<
 
-$(OBJS)\deprecateddll_dummy.o: ../../src/deprecated\..\..\..\src\msw\dummy.cpp
+$(OBJS)\deprecateddll_dummy.o: ../../src/deprecated/../../../src/msw/dummy.cpp
+       $(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
+
+$(OBJS)\deprecateddll_prop.o: ../../src/deprecated/prop.cpp
        $(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
 
-$(OBJS)\deprecateddll_prop.o: ../../src/deprecated\prop.cpp
+$(OBJS)\deprecateddll_propform.o: ../../src/deprecated/propform.cpp
        $(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
 
-$(OBJS)\deprecateddll_propform.o: ../../src/deprecated\propform.cpp
+$(OBJS)\deprecateddll_proplist.o: ../../src/deprecated/proplist.cpp
        $(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
 
-$(OBJS)\deprecateddll_proplist.o: ../../src/deprecated\proplist.cpp
+$(OBJS)\deprecateddll_resource.o: ../../src/deprecated/resource.cpp
        $(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
 
-$(OBJS)\deprecateddll_resource.o: ../../src/deprecated\resource.cpp
+$(OBJS)\deprecateddll_tbarsmpl.o: ../../src/deprecated/tbarsmpl.cpp
        $(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
 
-$(OBJS)\deprecateddll_treelay.o: ../../src/deprecated\treelay.cpp
+$(OBJS)\deprecateddll_treelay.o: ../../src/deprecated/treelay.cpp
        $(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
 
-$(OBJS)\deprecateddll_wxexpr.o: ../../src/deprecated\wxexpr.cpp
+$(OBJS)\deprecateddll_wxexpr.o: ../../src/deprecated/wxexpr.cpp
        $(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
 
-$(OBJS)\deprecatedlib_dosyacc.o: ../../src/deprecated\dosyacc.c
+$(OBJS)\deprecatedlib_dosyacc.o: ../../src/deprecated/dosyacc.c
        $(CC) -c -o $@ $(DEPRECATEDLIB_CFLAGS) $<
 
-$(OBJS)\deprecatedlib_dummy.o: ../../src/deprecated\..\..\..\src\msw\dummy.cpp
+$(OBJS)\deprecatedlib_dummy.o: ../../src/deprecated/../../../src/msw/dummy.cpp
+       $(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
+
+$(OBJS)\deprecatedlib_prop.o: ../../src/deprecated/prop.cpp
        $(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
 
-$(OBJS)\deprecatedlib_prop.o: ../../src/deprecated\prop.cpp
+$(OBJS)\deprecatedlib_propform.o: ../../src/deprecated/propform.cpp
        $(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
 
-$(OBJS)\deprecatedlib_propform.o: ../../src/deprecated\propform.cpp
+$(OBJS)\deprecatedlib_proplist.o: ../../src/deprecated/proplist.cpp
        $(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
 
-$(OBJS)\deprecatedlib_proplist.o: ../../src/deprecated\proplist.cpp
+$(OBJS)\deprecatedlib_resource.o: ../../src/deprecated/resource.cpp
        $(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
 
-$(OBJS)\deprecatedlib_resource.o: ../../src/deprecated\resource.cpp
+$(OBJS)\deprecatedlib_tbarsmpl.o: ../../src/deprecated/tbarsmpl.cpp
        $(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
 
-$(OBJS)\deprecatedlib_treelay.o: ../../src/deprecated\treelay.cpp
+$(OBJS)\deprecatedlib_treelay.o: ../../src/deprecated/treelay.cpp
        $(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
 
-$(OBJS)\deprecatedlib_wxexpr.o: ../../src/deprecated\wxexpr.cpp
+$(OBJS)\deprecatedlib_wxexpr.o: ../../src/deprecated/wxexpr.cpp
        $(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
 
 clean: