wxxml2-1.6-makefile.patch

wxxml2-1.6-makefile.patch (text/plain), 3.18 KB, created by proglottis on 2006-12-13 20:17:28 UTC

diff -crB wxxml2.old/Makefile.in wxxml2/Makefile.in
*** wxxml2.old/Makefile.in	2006-09-28 01:49:55.000000000 +1200
--- wxxml2/Makefile.in	2006-12-14 16:15:10.000000000 +1300
***************
*** 53,62 ****
  WXXML2_DLL_OBJECTS =  \
  	wxxml2_dll_xml2.o \
  	wxxml2_dll_dtd.o
- MINIMAL_CXXFLAGS = $(__WX_SHAREDDEFINE_p) -I./include $(WX_CXXFLAGS) \
- 	$(CPPFLAGS) $(CXXFLAGS)
- MINIMAL_OBJECTS =  \
- 	minimal_minimal.o
  
  ### Conditionally set variables: ###
  
--- 53,58 ----
***************
*** 109,124 ****
  	$(DLLPREFIX)wxxml2$(__wxxml2_dll___targetsuf2) \
  	$(LIBPREFIX)wxxml2.$(DLLIMP_SUFFIX)
  @COND_USE_SOSYMLINKS_1@__wxxml2_dll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___wxxml2_dll___so_symlinks_inst_cmd)
- @COND_PLATFORM_MAC_1@__minimal___mac_setfilecmd = \
- @COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL ./sample/minimal$(EXEEXT)
- COND_PLATFORM_OS2_1___minimal___os2_emxbindcmd = $(NM) minimal$(EXEEXT) | if \
- 	grep -q pmwin.763 ; then emxbind -ep minimal$(EXEEXT) ; fi
- @COND_PLATFORM_OS2_1@__minimal___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___minimal___os2_emxbindcmd)
  @COND_WX_SHARED_1@__WX_SHAREDDEFINE_p = -DWXUSINGDLL
  
  ### Targets: ###
  
! all: $(__wxxml2_lib___depname) $(__wxxml2_dll___depname) ./sample/minimal$(EXEEXT)
  
  install: all install-wxheaders $(__install_wxxml2_lib___depname) $(__install_wxxml2_dll___depname)
  
--- 105,115 ----
  	$(DLLPREFIX)wxxml2$(__wxxml2_dll___targetsuf2) \
  	$(LIBPREFIX)wxxml2.$(DLLIMP_SUFFIX)
  @COND_USE_SOSYMLINKS_1@__wxxml2_dll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___wxxml2_dll___so_symlinks_inst_cmd)
  @COND_WX_SHARED_1@__WX_SHAREDDEFINE_p = -DWXUSINGDLL
  
  ### Targets: ###
  
! all: $(__wxxml2_lib___depname) $(__wxxml2_dll___depname)
  
  install: all install-wxheaders $(__install_wxxml2_lib___depname) $(__install_wxxml2_dll___depname)
  
***************
*** 138,144 ****
  	rm -f ./lib/$(DLLPREFIX)wxxml2$(__wxxml2_dll___targetsuf3)
  	rm -f ./lib/$(LIBPREFIX)wxxml2.$(DLLIMP_SUFFIX)
  	rm -f ./lib/$(LIBPREFIX)wxxml2.$(DLLIMP_SUFFIX) ./lib/$(DLLPREFIX)wxxml2$(__wxxml2_dll___targetsuf2)
- 	rm -f ./sample/minimal$(EXEEXT)
  
  distclean: clean
  	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
--- 129,134 ----
***************
*** 245,256 ****
  @COND_WX_SHARED_1@	$(INSTALL_PROGRAM) ./lib/$(DLLPREFIX)wxxml2$(__wxxml2_dll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_WX_SHARED_1@	(cd $(DESTDIR)$(libdir) ; $(__wxxml2_dll___so_symlinks_inst_cmd))
  
- ./sample/minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__wxxml2_lib___depname)
- 	$(CXX) -o $@ $(MINIMAL_OBJECTS) -L./lib $(LDFLAGS)   -L./lib $(LDFLAGS_GUI)  -lwxxml2 -lxml2 $(WX_LIBS)
- 	
- 	$(__minimal___mac_setfilecmd)
- 	$(__minimal___os2_emxbindcmd)
- 
  wxxml2_lib_xml2.o: $(srcdir)/./src/xml2.cpp
  	$(CXXC) -c -o $@ $(WXXML2_LIB_CXXFLAGS) $(srcdir)/./src/xml2.cpp
  
--- 235,240 ----
***************
*** 263,272 ****
  wxxml2_dll_dtd.o: $(srcdir)/./src/dtd.cpp
  	$(CXXC) -c -o $@ $(WXXML2_DLL_CXXFLAGS) $(srcdir)/./src/dtd.cpp
  
- minimal_minimal.o: $(srcdir)/./sample/minimal.cpp
- 	$(CXXC) -c -o $@ $(MINIMAL_CXXFLAGS) $(srcdir)/./sample/minimal.cpp
- 
- 
  # Include dependency info, if present:
  @IF_GNU_MAKE@-include .deps/*.d
  
--- 247,252 ----