cleaning up common OSX code

[wxWidgets.git] / src / common / descrip.mms

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 003a5584046d50c1465ac58975531fb6b87f149e..c00584c408257efd17f45f5f54e04b389f623d14 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 29 September 2007                                                   *
+# Date : 10 January 2008                                                     *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -78,9 +78,6 @@ OBJECTS = \
                datacmn.obj,\
                datetime.obj,\
                datstrm.obj,\
-               db.obj,\
-               dbgrid.obj,\
-               dbtable.obj,\
                dcbase.obj,\
                dcbufcmn.obj,\
                dircmn.obj,\
@@ -210,7 +207,8 @@ OBJECTS2=tbarbase.obj,srchcmn.obj,\
                filepickercmn.obj,\
                fontpickercmn.obj,\
                pickerbase.obj,\
-               listctrlcmn.obj
+               listctrlcmn.obj,gsocketiohandler.obj,fdiodispatcher.obj,\
+               selectdispatcher.obj,overlaycmn.obj,windowid.obj
 
 OBJECTS_MOTIF=radiocmn.obj,combocmn.obj
 
@@ -220,10 +218,8 @@ OBJECTS_X11=accesscmn.obj,dndcmn.obj,dpycmn.obj,dseldlg.obj,\
        regex.obj,taskbarcmn.obj,xti.obj,xtistrm.obj,xtixml.obj,\
        combocmn.obj
 
-OBJECTS_X11_2=gsocketiohandler.obj,fdiodispatcher.obj,selectdispatcher.obj
 
-
-OBJECTS_GTK2=fontutilcmn.obj
+OBJECTS_GTK2=fontutilcmn.obj,cairo.obj
 
 SOURCES = \
                accelcmn.cpp,\
@@ -238,6 +234,7 @@ SOURCES = \
                bmpbase.cpp,\
                btncmn.cpp,\
                bookctrl.cpp,\
+               cairo.cpp,\
                choiccmn.cpp,\
                clipcmn.cpp,\
                clntdata.cpp,\
@@ -254,9 +251,6 @@ SOURCES = \
                datacmn.cpp,\
                datetime.cpp,\
                datstrm.cpp,\
-               db.cpp,\
-               dbgrid.cpp,\
-               dbtable.cpp,\
                dcbase.cpp,\
                dcbufcmn.cpp,\
                dircmn.cpp,\
@@ -331,6 +325,7 @@ SOURCES = \
                mstream.cpp,\
                nbkbase.cpp,\
                object.cpp,\
+               overlaycmn.cpp,\
                paper.cpp,\
                platinfo.cpp,\
                popupcmn.cpp,\
@@ -437,17 +432,22 @@ all : $(SOURCES)
 .else
 .ifdef __WXX11__
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS_X11)
-       $(MMS)$(MMSQUALIFIERS) $(OBJECTS_X11_2)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS1)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS2)
        library [--.lib]libwx_x11_univ.olb $(OBJECTS_X11)
-       library [--.lib]libwx_x11_univ.olb $(OBJECTS_X11_2)
 .endif
 .endif
 .endif
 .endif
 
+$(OBJECTS) : [--.include.wx]setup.h
+$(OBJECTS1) : [--.include.wx]setup.h
+$(OBJECTS2) : [--.include.wx]setup.h
+$(OBJECTS_X11) : [--.include.wx]setup.h
+$(OBJECTS_GTK2) : [--.include.wx]setup.h
+$(OBJECTS_MOTIF) : [--.include.wx]setup.h
+
 accelcmn.obj : accelcmn.cpp
 anidecod.obj : anidecod.cpp
 animatecmn.obj : animatecmn.cpp
@@ -476,9 +476,6 @@ ctrlsub.obj : ctrlsub.cpp
 datacmn.obj : datacmn.cpp
 datetime.obj : datetime.cpp
 datstrm.obj : datstrm.cpp
-db.obj : db.cpp
-dbgrid.obj : dbgrid.cpp
-dbtable.obj : dbtable.cpp
 dcbase.obj : dcbase.cpp
 dcbufcmn.obj : dcbufcmn.cpp
 dircmn.obj : dircmn.cpp
@@ -630,3 +627,6 @@ listctrlcmn.obj : listctrlcmn.cpp
 srchcmn.obj : srchcmn.cpp
 textentrycmn.obj : textentrycmn.cpp
 filectrlcmn.obj : filectrlcmn.cpp
+cairo.obj : cairo.cpp
+overlaycmn.obj : overlaycmn.cpp
+windowid.obj : windowid.cpp