Merge in from trunk r64802 - r68625

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

diff --git a/src/x11/descrip.mms b/src/x11/descrip.mms
index 8ad7b6a5e1522bfcaa029290c7cadce95174a89d..b0081a1efc3e24853aa7a98737abb14aa4011802 100644 (file)
--- a/src/x11/descrip.mms
+++ b/src/x11/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 21 August 2006                                                      *
+# Date : 3 January 2008                                                      *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -34,6 +34,7 @@ OBJECTS = \
                bitmap.obj,\
                brush.obj,\
                glcanvas.obj,\
+               palette.obj,\
                pen.obj,\
                region.obj,\
                utilsx.obj
@@ -44,10 +45,8 @@ OBJECTS_X11=app.obj,dc.obj,\
                dcscreen.obj,\
                evtloop.obj,\
                font.obj,\
-               gsockx11.obj,\
                minifram.obj,\
                nanox.obj,\
-               palette.obj,\
                popupwin.obj,\
                reparent.obj,\
                settings.obj,\
@@ -75,7 +74,6 @@ SOURCES = \
                dcscreen.cpp,\
                evtloop.cpp,\
                font.cpp,\
-               gsockx11.cpp,\
                minifram.cpp,\
                nanox.c,\
                palette.cpp,\
@@ -103,6 +101,9 @@ all : $(SOURCES)
 .endif
 .endif
 
+$(OBJECTS) : [--.include.wx]setup.h
+$(OBJECTS_X11) : [--.include.wx]setup.h
+
 bitmap.obj : bitmap.cpp
 brush.obj : brush.cpp
 glcanvas.obj : glcanvas.cpp
@@ -115,7 +116,6 @@ dcmemory.obj : dcmemory.cpp
 dcscreen.obj : dcscreen.cpp
 evtloop.obj : evtloop.cpp
 font.obj : font.cpp
-gsockx11.obj : gsockx11.cpp
 minifram.obj : minifram.cpp
 nanox.obj : nanox.c
 palette.obj : palette.cpp