wxUsleep() introduced (and documented) to try to work around usleep() bug in

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

diff --git a/src/motif/makefile.unx b/src/motif/makefile.unx
index f1c5a48a1f62dd7b7be9f2aab2653a480ee64c9e..15b53d06b8bc029a68572ebbcb4da8d9aa11f8c4 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/helpbase.cpp \
  ../common/intl.cpp \
  ../common/ipcbase.cpp \

+ ../common/image.cpp \

  ../common/layout.cpp \
  ../common/list.cpp \
  ../common/log.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/module.cpp \
  ../common/object.cpp \
  ../common/odbc.cpp \

- ../common/postscrp.cpp \

  ../common/prntbase.cpp \
  ../common/resource.cpp \
  ../common/serbase.cpp \
  ../common/prntbase.cpp \
  ../common/resource.cpp \
  ../common/serbase.cpp \


@@ -46,18 +46,20 @@ LIB_CPP_SRC=\
  ../common/textfile.cpp \
  ../common/tbarbase.cpp \
  ../common/tbarsmpl.cpp \
  ../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/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 \
  ../common/sckstrm.cpp \
  ../common/validate.cpp \
  ../common/mstream.cpp \
  ../common/zstream.cpp \
  ../common/objstrm.cpp \
  ../common/sckstrm.cpp \
  ../common/validate.cpp \

+ ../common/valgen.cpp \

  ../common/valtext.cpp \
  ../common/variant.cpp \
  ../common/wxexpr.cpp \
  ../common/valtext.cpp \
  ../common/variant.cpp \
  ../common/wxexpr.cpp \


@@ -80,25 +82,22 @@ LIB_CPP_SRC=\
  choice.cpp \
  clipbrd.cpp \
  colour.cpp \
  choice.cpp \
  clipbrd.cpp \
  colour.cpp \

- colordlg.cpp \

  control.cpp \
  combobox.cpp \
  cursor.cpp \
  data.cpp \
  control.cpp \
  combobox.cpp \
  cursor.cpp \
  data.cpp \

+ dataobj.cpp \

  dc.cpp \
  dcclient.cpp \
  dcmemory.cpp \
  dcscreen.cpp \
  dialog.cpp \
  dc.cpp \
  dcclient.cpp \
  dcmemory.cpp \
  dcscreen.cpp \
  dialog.cpp \

- dirdlg.cpp \

  dnd.cpp \
  filedlg.cpp \
  font.cpp \
  dnd.cpp \
  filedlg.cpp \
  font.cpp \

- fontdlg.cpp \

  frame.cpp \
  gauge.cpp \
  gdiobj.cpp \
  frame.cpp \
  gauge.cpp \
  gdiobj.cpp \

- helpxxxx.cpp \

  icon.cpp \
  listbox.cpp \
  joystick.cpp \
  icon.cpp \
  listbox.cpp \
  joystick.cpp \


@@ -106,13 +105,10 @@ LIB_CPP_SRC=\
  mdi.cpp \
  menu.cpp \
  menuitem.cpp \
  mdi.cpp \
  menu.cpp \
  menuitem.cpp \

- metafile.cpp \

  minifram.cpp \
  msgdlg.cpp \
  minifram.cpp \
  msgdlg.cpp \

- notebook.cpp \

  palette.cpp \
  pen.cpp \
  palette.cpp \
  pen.cpp \

- print.cpp \

  radiobox.cpp \
  radiobut.cpp \
  region.cpp \
  radiobox.cpp \
  radiobut.cpp \
  region.cpp \


@@ -135,15 +131,23 @@ LIB_CPP_SRC=\
 \
  ../generic/choicdgg.cpp \
  ../generic/colrdlgg.cpp \
 \
  ../generic/choicdgg.cpp \
  ../generic/colrdlgg.cpp \

+ ../generic/dirdlgg.cpp \
+ ../generic/dcpsg.cpp \

  ../generic/fontdlgg.cpp \
  ../generic/gridg.cpp \
  ../generic/fontdlgg.cpp \
  ../generic/gridg.cpp \

+ ../generic/helphtml.cpp \
+ ../generic/helpext.cpp \

  ../generic/imaglist.cpp \
  ../generic/listctrl.cpp \
  ../generic/laywin.cpp \
  ../generic/msgdlgg.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/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 \
  ../generic/sashwin.cpp \
  ../generic/scrolwin.cpp \
  ../generic/splitter.cpp \


@@ -152,13 +156,6 @@ LIB_CPP_SRC=\
  ../generic/textdlgg.cpp \
  ../generic/treectrl.cpp
 
  ../generic/textdlgg.cpp \
  ../generic/treectrl.cpp
 

-# If you're not using the generic ones, you
-# may wish to define platform-specific ones
-# 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_SRC=\
   ../zlib/adler32.c ../zlib/deflate.c ../zlib/infblock.c\
   ../zlib/inflate.c ../zlib/zutil.c ../zlib/compress.c \


@@ -175,18 +172,19 @@ 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=\
 # 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=

 
 

-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
+#  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)
+all:    $(WXLIB) png zlib

 
 # Define library objects
 OBJECTS=\
 
 # Define library objects
 OBJECTS=\


@@ -197,17 +195,26 @@ $(WXLIB) : $(OBJECTS)
        $(RANLIB) $@
 
 ../common/y_tab.$(OBJSUFF):    ../common/y_tab.c ../common/lex_yy.c
        $(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
 # above.
 ../common/lex_yy.c:    ../common/lexer.l
 
 # Replace lex with flex if you run into compilation
 # problems with lex_yy.c. See also note about LEX_SCANNER
 # above.
 ../common/lex_yy.c:    ../common/lexer.l

-       $(LEX) -o../common/lex.yy.c ../common/lexer.l 
-       sed -e "s/BUFSIZ/5000/g" < ../common/lex.yy.c | \
+       $(LEX) ../common/lexer.l
+       sed -e "s/BUFSIZ/5000/g" < lex.yy.c | \

        sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \
         sed -e "s/YYLMAX 200/YYLMAX 5000/g" > ../common/lex_yy.c
        sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \
         sed -e "s/YYLMAX 200/YYLMAX 5000/g" > ../common/lex_yy.c

-       /bin/rm -f ../common/lex.yy.c
+       /bin/rm -f lex.yy.c
+
+# The above should work with both lex and flex, but just in case not,
+# here are alternative syntaxes.
+#
+# Flex-style syntax:
+# $(LEX) -olex.yy.c ../common/lexer.l 
+
+# Lex-style syntax:
+#    $(LEX) ../common/lexer.l

 
 # Replace yacc with bison if you run into compilation
 # problems with y_tab.c.
 
 # Replace yacc with bison if you run into compilation
 # problems with y_tab.c.


@@ -218,6 +225,18 @@ $(WXLIB) : $(OBJECTS)
 combobox/combobox.o: combobox/combobox.c
        $(CCC) -c $(CFLAGS) -o $@ combobox/combobox.c
 
 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)
 
        rm -f $(OBJECTS) $(WXLIB)
 

+cleanzlib:
+       cd ../zlib; make -f makefile.unx cleanmotif
+
+cleanpng:
+       cd ../png; make -f makefile.unx cleanmotif
+