Doc mods, sash window bug

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

diff --git a/src/motif/makefile.unx b/src/motif/makefile.unx
index 157807bf67f1a14ff2acc5546d718906e10d34de..eda10a023f95616be797840b1b7d566cedb24a86 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 \
@@ -38,7 +39,6 @@ LIB_CPP_SRC=\
  ../common/module.cpp \
  ../common/object.cpp \
  ../common/odbc.cpp \
- ../common/postscrp.cpp \
  ../common/prntbase.cpp \
  ../common/resource.cpp \
  ../common/serbase.cpp \
@@ -81,11 +81,11 @@ LIB_CPP_SRC=\
  choice.cpp \
  clipbrd.cpp \
  colour.cpp \
- colordlg.cpp \
  control.cpp \
  combobox.cpp \
  cursor.cpp \
  data.cpp \
+ dataobj.cpp \
  dc.cpp \
  dcclient.cpp \
  dcmemory.cpp \
@@ -94,11 +94,9 @@ LIB_CPP_SRC=\
  dnd.cpp \
  filedlg.cpp \
  font.cpp \
- fontdlg.cpp \
  frame.cpp \
  gauge.cpp \
  gdiobj.cpp \
- helpxxxx.cpp \
  icon.cpp \
  listbox.cpp \
  joystick.cpp \
@@ -106,12 +104,10 @@ LIB_CPP_SRC=\
  mdi.cpp \
  menu.cpp \
  menuitem.cpp \
- metafile.cpp \
  minifram.cpp \
  msgdlg.cpp \
  palette.cpp \
  pen.cpp \
- print.cpp \
  radiobox.cpp \
  radiobut.cpp \
  region.cpp \
@@ -135,8 +131,10 @@ LIB_CPP_SRC=\
  ../generic/choicdgg.cpp \
  ../generic/colrdlgg.cpp \
  ../generic/dirdlgg.cpp \
+ ../generic/dcpsg.cpp \
  ../generic/fontdlgg.cpp \
  ../generic/gridg.cpp \
+ ../generic/helphtml.cpp \
  ../generic/helpext.cpp \
  ../generic/imaglist.cpp \
  ../generic/listctrl.cpp \
@@ -146,6 +144,9 @@ LIB_CPP_SRC=\
  ../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,14 +155,6 @@ LIB_CPP_SRC=\
  ../generic/textdlgg.cpp \
  ../generic/treectrl.cpp
 
-# 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 \
@@ -178,7 +171,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=\
 
@@ -190,7 +183,7 @@ EXTRA_CPP_SRC=\
 #  mdi/lib/XsOutline.C\
 #  mdi/lib/XsResizeOutline.C
 
-all:    $(WXLIB)
+all:    $(WXLIB) png zlib
 
 # Define library objects
 OBJECTS=\
@@ -222,6 +215,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
+