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 b525da7c7f2ce963cf55cd4bdeb95c32ddb8a79a..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 \
@@ -46,13 +47,14 @@ LIB_CPP_SRC=\
  ../common/textfile.cpp \
  ../common/tbarbase.cpp \
  ../common/tbarsmpl.cpp \
+ ../common/time.cpp \
  ../common/timercmn.cpp \
  ../common/utilscmn.cpp \
  ../common/wincmn.cpp \
  ../common/framecmn.cpp \
  ../common/stream.cpp \
  ../common/datstrm.cpp \
- ../common/fstream.cpp \
+ ../common/wfstream.cpp \
  ../common/mstream.cpp \
  ../common/zstream.cpp \
  ../common/objstrm.cpp \
@@ -85,12 +87,12 @@ LIB_CPP_SRC=\
  combobox.cpp \
  cursor.cpp \
  data.cpp \
+ dataobj.cpp \
  dc.cpp \
  dcclient.cpp \
  dcmemory.cpp \
  dcscreen.cpp \
  dialog.cpp \
- dirdlg.cpp \
  dnd.cpp \
  filedlg.cpp \
  font.cpp \
@@ -98,7 +100,6 @@ LIB_CPP_SRC=\
  frame.cpp \
  gauge.cpp \
  gdiobj.cpp \
- helpxxxx.cpp \
  icon.cpp \
  listbox.cpp \
  joystick.cpp \
@@ -109,7 +110,6 @@ LIB_CPP_SRC=\
  metafile.cpp \
  minifram.cpp \
  msgdlg.cpp \
- notebook.cpp \
  palette.cpp \
  pen.cpp \
  print.cpp \
@@ -135,15 +135,21 @@ LIB_CPP_SRC=\
 \
  ../generic/choicdgg.cpp \
  ../generic/colrdlgg.cpp \
+ ../generic/dirdlgg.cpp \
  ../generic/fontdlgg.cpp \
  ../generic/gridg.cpp \
+ ../generic/helpext.cpp \
  ../generic/imaglist.cpp \
  ../generic/listctrl.cpp \
  ../generic/laywin.cpp \
  ../generic/msgdlgg.cpp \
+ ../generic/notebook.cpp \
  ../generic/panelg.cpp \
  ../generic/printps.cpp \
  ../generic/prntdlgg.cpp \
+ ../generic/prop.cpp \
+ ../generic/propform.cpp \
+ ../generic/proplist.cpp \
  ../generic/sashwin.cpp \
  ../generic/scrolwin.cpp \
  ../generic/splitter.cpp \
@@ -154,29 +160,41 @@ LIB_CPP_SRC=\
 
 # If you're not using the generic ones, you
 # may wish to define platform-specific ones
+# dirdlg.cpp \
 # treectrl.cpp \
 # listctrl.cpp \
 # imaglist.cpp \
 # statusbr.cpp \
+
+ZLIB_SRC=\
+  ../zlib/adler32.c ../zlib/deflate.c ../zlib/infblock.c\
+  ../zlib/inflate.c ../zlib/zutil.c ../zlib/compress.c \
+  ../zlib/infcodes.c ../zlib/inftrees.c ../zlib/trees.c \
+  ../zlib/crc32.c ../zlib/gzio.c ../zlib/inffast.c\
+  ../zlib/infutil.c ../zlib/uncompr.c
  
 LIB_C_SRC=\
 \
  ../common/y_tab.c \
  ../common/extended.c
 
+# Only need to compile zlib files if we don't
+# 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
 
 EXTRA_CPP_SRC=\
-  mdi/lib/XsComponent.C\
-  mdi/lib/XsMDICanvas.C\
-  mdi/lib/XsMDIWindow.C\
-  mdi/lib/XsMotifWindow.C\
-  mdi/lib/XsMoveOutline.C\
-  mdi/lib/XsOutline.C\
-  mdi/lib/XsResizeOutline.C
 
-all:    $(WXLIB)
+#  mdi/lib/XsComponent.C\
+#  mdi/lib/XsMDICanvas.C\
+#  mdi/lib/XsMDIWindow.C\
+#  mdi/lib/XsMotifWindow.C\
+#  mdi/lib/XsMoveOutline.C\
+#  mdi/lib/XsOutline.C\
+#  mdi/lib/XsResizeOutline.C
+
+all:    $(WXLIB) png zlib
 
 # Define library objects
 OBJECTS=\
@@ -187,7 +205,7 @@ $(WXLIB) : $(OBJECTS)
        $(RANLIB) $@
 
 ../common/y_tab.$(OBJSUFF):    ../common/y_tab.c ../common/lex_yy.c
-       $(CCLEX) -c $(CFLAGS) -o $@ ../common/y_tab.c
+       $(CCLEX) -c $(CFLAGS) -DNO_CONFIGURE -o $@ ../common/y_tab.c
 
 # Replace lex with flex if you run into compilation
 # problems with lex_yy.c. See also note about LEX_SCANNER
@@ -208,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
+