Changes to WXDLLEXPORT keyword position for VC++ 6.0; changed

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

diff --git a/src/motif/makefile.unx b/src/motif/makefile.unx
index d447de494934c131e4b21cd294493e8b7e1fc1c2..a05e8a12822389aa933753c39734ec486083e7a8 100644 (file)
--- a/src/motif/makefile.unx
+++ b/src/motif/makefile.unx
@@ -52,7 +52,7 @@ LIB_CPP_SRC=\
  ../common/framecmn.cpp \
  ../common/stream.cpp \
  ../common/datstrm.cpp \
- ../common/fstream.cpp \
+ ../common/wfstream.cpp \
  ../common/mstream.cpp \
  ../common/zstream.cpp \
  ../common/objstrm.cpp \
@@ -127,6 +127,7 @@ LIB_CPP_SRC=\
  textctrl.cpp \
  thread.cpp \
  timer.cpp \
+ toolbar.cpp \
  utils.cpp \
  utilsexc.cpp \
  wave.cpp \
@@ -136,6 +137,7 @@ LIB_CPP_SRC=\
  ../generic/colrdlgg.cpp \
  ../generic/fontdlgg.cpp \
  ../generic/gridg.cpp \
+ ../generic/helpext.cpp \
  ../generic/imaglist.cpp \
  ../generic/listctrl.cpp \
  ../generic/laywin.cpp \
@@ -157,25 +159,46 @@ LIB_CPP_SRC=\
 # listctrl.cpp \
 # imaglist.cpp \
 # statusbr.cpp \
-# toolbar.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 # $(ZLIB_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
+
 all:    $(WXLIB)
 
 # Define library objects
 OBJECTS=\
- $(LIB_CPP_SRC:.cpp=.o) $(LIB_C_SRC:.c=.o)
+ $(LIB_CPP_SRC:.cpp=.o) $(LIB_C_SRC:.c=.o) $(EXTRA_C_SRC:.c=.o) $(EXTRA_CPP_SRC:.C=.o)
 
 $(WXLIB) : $(OBJECTS)
        ar $(AROPTIONS) $@ $(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
@@ -193,6 +216,8 @@ $(WXLIB) : $(OBJECTS)
        $(YACC) ../common/parser.y
        mv y.tab.c ../common/y_tab.c
 
+combobox/combobox.o: combobox/combobox.c
+       $(CCC) -c $(CFLAGS) -o $@ combobox/combobox.c
 
 clean:
        rm -f $(OBJECTS) $(WXLIB)