OnExit() is called for modules which were initialized even if the init of

[wxWidgets.git] / src / motif / makefile.unx

diff --git a/src/motif/makefile.unx b/src/motif/makefile.unx
index fd2d922b979038e6da4c0a808cfdc461400ed701..6349e83663cba08ff9577b6851593e1524dd53f1 100644 (file)
--- a/src/motif/makefile.unx
+++ b/src/motif/makefile.unx
@@ -30,6 +30,7 @@ LIB_CPP_SRC=\
  ../common/helpbase.cpp \
  ../common/intl.cpp \
  ../common/ipcbase.cpp \
+ ../common/image.cpp \
  ../common/layout.cpp \
  ../common/list.cpp \
  ../common/log.cpp \
@@ -86,6 +87,7 @@ LIB_CPP_SRC=\
  combobox.cpp \
  cursor.cpp \
  data.cpp \
+ dataobj.cpp \
  dc.cpp \
  dcclient.cpp \
  dcmemory.cpp \
@@ -98,7 +100,6 @@ LIB_CPP_SRC=\
  frame.cpp \
  gauge.cpp \
  gdiobj.cpp \
- helpxxxx.cpp \
  icon.cpp \
  listbox.cpp \
  joystick.cpp \
@@ -181,7 +182,7 @@ LIB_C_SRC=\
 # already have a zlib library installed on our system
 # (or we wish to statically link them for some reason)
 EXTRA_C_SRC=\
-  xmcombo/xmcombo.c # $(ZLIB_SRC)
+  xmcombo/xmcombo.c
 
 EXTRA_CPP_SRC=\
 
@@ -193,7 +194,7 @@ EXTRA_CPP_SRC=\
 #  mdi/lib/XsOutline.C\
 #  mdi/lib/XsResizeOutline.C
 
-all:    $(WXLIB)
+all:    $(WXLIB) png zlib
 
 # Define library objects
 OBJECTS=\
@@ -225,6 +226,18 @@ $(WXLIB) : $(OBJECTS)
 combobox/combobox.o: combobox/combobox.c
        $(CCC) -c $(CFLAGS) -o $@ combobox/combobox.c
 
-clean:
+zlib:
+       cd ../zlib; make -f makefile.unx motif
+
+png:
+       cd ../png; make -f makefile.unx motif
+
+clean: cleanzlib cleanpng
        rm -f $(OBJECTS) $(WXLIB)
 
+cleanzlib:
+       cd ../zlib; make -f makefile.unx cleanmotif
+
+cleanpng:
+       cd ../png; make -f makefile.unx cleanmotif
+