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 fcaa095e9e57cc6f293ad81c343bfb61c84a86bd..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,6 +47,7 @@ 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/timercmn.cpp \
  ../common/utilscmn.cpp \
  ../common/wincmn.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 \


@@ -135,6 +134,7 @@ 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/helpext.cpp \
  ../generic/fontdlgg.cpp \
  ../generic/gridg.cpp \
  ../generic/helpext.cpp \


@@ -142,9 +142,13 @@ LIB_CPP_SRC=\
  ../generic/listctrl.cpp \
  ../generic/laywin.cpp \
  ../generic/msgdlgg.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 \


@@ -155,6 +159,7 @@ 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 \
 # treectrl.cpp \
 # listctrl.cpp \
 # imaglist.cpp \


@@ -176,7 +181,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=\
 # 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=\
 


@@ -188,7 +193,7 @@ EXTRA_CPP_SRC=\
 #  mdi/lib/XsOutline.C\
 #  mdi/lib/XsResizeOutline.C
 
 #  mdi/lib/XsOutline.C\
 #  mdi/lib/XsResizeOutline.C
 

-all:    $(WXLIB)
+all:    $(WXLIB) png zlib

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


@@ -220,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
+