added an error message if a bitmap can't be addedto the image list

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

diff --git a/src/motif/makefile.unx b/src/motif/makefile.unx
index d447de494934c131e4b21cd294493e8b7e1fc1c2..31386a99c3a34663bbadac2d8561d03f0dd63c5d 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 \


@@ -46,13 +47,14 @@ 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/mstream.cpp \
  ../common/zstream.cpp \
  ../common/objstrm.cpp \


@@ -90,7 +92,6 @@ LIB_CPP_SRC=\
  dcmemory.cpp \
  dcscreen.cpp \
  dialog.cpp \
  dcmemory.cpp \
  dcscreen.cpp \
  dialog.cpp \

- dirdlg.cpp \

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


@@ -98,7 +99,6 @@ LIB_CPP_SRC=\
  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 \


@@ -109,7 +109,6 @@ LIB_CPP_SRC=\
  metafile.cpp \
  minifram.cpp \
  msgdlg.cpp \
  metafile.cpp \
  minifram.cpp \
  msgdlg.cpp \

- notebook.cpp \

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


@@ -127,6 +126,7 @@ LIB_CPP_SRC=\
  textctrl.cpp \
  thread.cpp \
  timer.cpp \
  textctrl.cpp \
  thread.cpp \
  timer.cpp \

+ toolbar.cpp \

  utils.cpp \
  utilsexc.cpp \
  wave.cpp \
  utils.cpp \
  utilsexc.cpp \
  wave.cpp \


@@ -134,15 +134,21 @@ LIB_CPP_SRC=\
 \
  ../generic/choicdgg.cpp \
  ../generic/colrdlgg.cpp \
 \
  ../generic/choicdgg.cpp \
  ../generic/colrdlgg.cpp \

+ ../generic/dirdlgg.cpp \

  ../generic/fontdlgg.cpp \
  ../generic/gridg.cpp \
  ../generic/fontdlgg.cpp \
  ../generic/gridg.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 \


@@ -153,29 +159,52 @@ LIB_CPP_SRC=\
 
 # If you're not using the generic ones, you
 # may wish to define platform-specific ones
 
 # 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 \
 # treectrl.cpp \
 # 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
 
  
 LIB_C_SRC=\
 \
  ../common/y_tab.c \
  ../common/extended.c
 

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

 
 # Define library objects
 OBJECTS=\
 
 # 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
 
 $(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
 
 # Replace lex with flex if you run into compilation
 # problems with lex_yy.c. See also note about LEX_SCANNER


@@ -193,7 +222,21 @@ $(WXLIB) : $(OBJECTS)
        $(YACC) ../common/parser.y
        mv y.tab.c ../common/y_tab.c
 
        $(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:
+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
+