wxMenu compile fix

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

diff --git a/src/motif/makefile.unx b/src/motif/makefile.unx
index 28d029c18550d0e97239046705898d9bc1021156..55b61ca7da5b41aa10f917ddcdd76de7c0735091 100644 (file)
--- a/src/motif/makefile.unx
+++ b/src/motif/makefile.unx
@@ -16,6 +16,7 @@ LIB_CPP_SRC=\
 \
  ../common/cmndata.cpp \
  ../common/config.cpp \
+ ../common/dcbase.cpp \
  ../common/date.cpp \
  ../common/docmdi.cpp \
  ../common/docview.cpp \
@@ -30,6 +31,10 @@ LIB_CPP_SRC=\
  ../common/helpbase.cpp \
  ../common/intl.cpp \
  ../common/ipcbase.cpp \
+ ../common/image.cpp \
+ ../common/imagjpeg.cpp \
+ ../common/imagpng.cpp \
+ ../common/imaggif.cpp \
  ../common/layout.cpp \
  ../common/list.cpp \
  ../common/log.cpp \
@@ -38,10 +43,10 @@ LIB_CPP_SRC=\
  ../common/module.cpp \
  ../common/object.cpp \
  ../common/odbc.cpp \
- ../common/postscrp.cpp \
  ../common/prntbase.cpp \
  ../common/resource.cpp \
  ../common/serbase.cpp \
+ ../common/paper.cpp \
  ../common/string.cpp \
  ../common/textfile.cpp \
  ../common/tbarbase.cpp \
@@ -59,17 +64,23 @@ LIB_CPP_SRC=\
  ../common/objstrm.cpp \
  ../common/sckstrm.cpp \
  ../common/validate.cpp \
+ ../common/valgen.cpp \
  ../common/valtext.cpp \
  ../common/variant.cpp \
  ../common/wxexpr.cpp \
+ ../common/wxchar.cpp \
  ../common/socket.cpp \
  ../common/sckaddr.cpp \
+ ../common/sckint.cpp \
  ../common/sckipc.cpp \
  ../common/protocol.cpp \
  ../common/ftp.cpp \
  ../common/http.cpp \
  ../common/url.cpp \
  ../common/tokenzr.cpp \
+\
+ ../unix/threadpsx.cpp \
+ ../unix/utilsunx.cpp \
 \
  accel.cpp \
  app.cpp \
@@ -81,11 +92,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,7 +105,6 @@ LIB_CPP_SRC=\
  dnd.cpp \
  filedlg.cpp \
  font.cpp \
- fontdlg.cpp \
  frame.cpp \
  gauge.cpp \
  gdiobj.cpp \
@@ -105,12 +115,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 \
@@ -123,19 +131,19 @@ LIB_CPP_SRC=\
  stattext.cpp \
  taskbar.cpp \
  textctrl.cpp \
- thread.cpp \
  timer.cpp \
  toolbar.cpp \
  utils.cpp \
- utilsexc.cpp \
  wave.cpp \
  window.cpp \
 \
  ../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 \
@@ -156,14 +164,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 \
@@ -180,9 +180,9 @@ 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=\
+EXTRA_CPP_SRC=
 
 #  mdi/lib/XsComponent.C\
 #  mdi/lib/XsMDICanvas.C\
@@ -192,7 +192,7 @@ EXTRA_CPP_SRC=\
 #  mdi/lib/XsOutline.C\
 #  mdi/lib/XsResizeOutline.C
 
-all:    $(WXLIB)
+all:    $(WXLIB) png zlib
 
 # Define library objects
 OBJECTS=\
@@ -209,11 +209,20 @@ $(WXLIB) : $(OBJECTS)
 # 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
-       /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.
@@ -224,6 +233,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
+