removed libxpm dependencies from makefiles

[wxWidgets.git] / contrib / src / xml / makefile.g95

diff --git a/contrib/src/xml/makefile.g95 b/contrib/src/xml/makefile.g95
index 75d4bca0bf173bbae9b0348e88f851432c7b00e1..44a0025a336c6042ca299536f141906e303d860d 100644 (file)
--- a/contrib/src/xml/makefile.g95
+++ b/contrib/src/xml/makefile.g95
@@ -9,15 +9,32 @@
 
 WXDIR = ../../..
 
 
 WXDIR = ../../..
 

-EXTRACPPFLAGS=/Id:/libxml/libxml2-2.1.1
+expat_dir = $(WXDIR)/contrib/src/xml/expat
+XMLPARSEDIR = $(expat_dir)/xmlparse
+XMLTOKDIR=$(expat_dir)/xmltok
+
+EXPAT_DEFS=-I$(expat_dir)/xmlparse -I$(expat_dir)/xmltok
+
+EXTRACPPFLAGS=$(EXPAT_DEFS)
+XMLPARSEDIR_OBJECTS=xmlparse.o
+XMLTOKDIR_OBJECTS=xmltok.o xmlrole.o
+

 LIBTARGET=$(WXDIR)/lib/libwxxml.a
 
 LIBTARGET=$(WXDIR)/lib/libwxxml.a
 

-OBJECTS=xml.o xmlbin.o xmlbinz.o xmlpars.o xmlres.o xmlrsall.o \
+OBJECTS= $(XMLPARSEDIR_OBJECTS) $(XMLTOKDIR_OBJECTS) \
+        xml.o xmlbin.o xmlbinz.o xmlexpat.o xmlwrite.o xmlres.o xmlrsall.o \

         xh_bttn.o xh_chckb.o xh_chckl.o xh_choic.o xh_combo.o xh_dlg.o \
         xh_gauge.o xh_html.o xh_menu.o xh_notbk.o xh_panel.o xh_radbt.o \
         xh_radbx.o xh_sizer.o xh_slidr.o xh_spin.o xh_stbmp.o xh_sttxt.o \
         xh_bttn.o xh_chckb.o xh_chckl.o xh_choic.o xh_combo.o xh_dlg.o \
         xh_gauge.o xh_html.o xh_menu.o xh_notbk.o xh_panel.o xh_radbt.o \
         xh_radbx.o xh_sizer.o xh_slidr.o xh_spin.o xh_stbmp.o xh_sttxt.o \

-        xh_text.o xh_listb.o xh_toolb.o \
-        xh_bmpbt.o xh_cald.o xh_listc.o xh_scrol.o xh_stbox.o xh_tree.o
+        xh_text.o xh_listb.o xh_toolb.o xh_stlin.o xh_bmp.o xh_unkwn.o \
+        xh_bmpbt.o xh_cald.o xh_listc.o xh_scrol.o xh_stbox.o xh_tree.o \
+        xh_frame.o

 
 include $(WXDIR)/src/makelib.g95
 
 
 include $(WXDIR)/src/makelib.g95
 

+$(XMLPARSEDIR_OBJECTS):
+       $(CC) -g $(EXPAT_DEFS) -c -o $@ $(XMLPARSEDIR)/$(patsubst %.o,%.c, $@)
+
+$(XMLTOKDIR_OBJECTS):
+       $(CC) -g $(EXPAT_DEFS) -c -o $@ $(XMLTOKDIR)/$(patsubst %.o,%.c, $@)
+