[Wxlua-commit] wxLua/modules Makefile.in,1.64,1.65

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/wxlua/wxLua/modules
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20968/wxLua/modules

Modified Files:
	Makefile.in 
Log Message:
Renamed wxcore_wxlprint to wxcore_wxlcore and wxhtml_wxlhtmlwin to wxhtml_wxlhtml
  since these files contain more than just printing or the htmlwin.
Updated configure.ac to check for $WXSTEDIT shell env var and added --with-wxstedit-prefix
  to make it easier to specify where wxStEdit is.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** Makefile.in	10 Jan 2008 17:04:25 -0000	1.64
--- Makefile.in	10 Jan 2008 23:06:24 -0000	1.65
***************
*** 238,242 ****
  	wxbindcore_lib_wxcore_sizer.o \
  	wxbindcore_lib_wxcore_windows.o \
! 	wxbindcore_lib_wxcore_wxlprint.o \
  	wxbindcore_lib_dummy.o
  WXBINDCORE_LIB_ODEP = \
--- 238,242 ----
  	wxbindcore_lib_wxcore_sizer.o \
  	wxbindcore_lib_wxcore_windows.o \
! 	wxbindcore_lib_wxcore_wxlcore.o \
  	wxbindcore_lib_dummy.o
  WXBINDCORE_LIB_ODEP = \
***************
*** 265,269 ****
  	wxbindcore_dll_wxcore_sizer.o \
  	wxbindcore_dll_wxcore_windows.o \
! 	wxbindcore_dll_wxcore_wxlprint.o \
  	wxbindcore_dll_dummy.o
  WXBINDCORE_DLL_ODEP = \
--- 265,269 ----
  	wxbindcore_dll_wxcore_sizer.o \
  	wxbindcore_dll_wxcore_windows.o \
! 	wxbindcore_dll_wxcore_wxlcore.o \
  	wxbindcore_dll_dummy.o
  WXBINDCORE_DLL_ODEP = \
***************
*** 294,298 ****
  	wxbindhtml_lib_wxhtml_bind.o \
  	wxbindhtml_lib_wxhtml_html.o \
! 	wxbindhtml_lib_wxhtml_wxlhtmlwin.o \
  	wxbindhtml_lib_dummy.o
  WXBINDHTML_LIB_ODEP = \
--- 294,298 ----
  	wxbindhtml_lib_wxhtml_bind.o \
  	wxbindhtml_lib_wxhtml_html.o \
! 	wxbindhtml_lib_wxhtml_wxlhtml.o \
  	wxbindhtml_lib_dummy.o
  WXBINDHTML_LIB_ODEP = \
***************
*** 305,309 ****
  	wxbindhtml_dll_wxhtml_bind.o \
  	wxbindhtml_dll_wxhtml_html.o \
! 	wxbindhtml_dll_wxhtml_wxlhtmlwin.o \
  	wxbindhtml_dll_dummy.o
  WXBINDHTML_DLL_ODEP = \
--- 305,309 ----
  	wxbindhtml_dll_wxhtml_bind.o \
  	wxbindhtml_dll_wxhtml_html.o \
! 	wxbindhtml_dll_wxhtml_wxlhtml.o \
  	wxbindhtml_dll_dummy.o
  WXBINDHTML_DLL_ODEP = \
***************
*** 2055,2059 ****
  @COND_SHARED_0@install_wxbindcore_lib_headers: 
  @COND_SHARED_0@	$(INSTALL_DIR) $(DESTDIR)$(includedir)
! @COND_SHARED_0@	for f in  wxbind/include/wxcore_bind.h wxbind/include/wxcore_wxlprint.h; do \
  @COND_SHARED_0@	if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
  @COND_SHARED_0@	$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
--- 2055,2059 ----
  @COND_SHARED_0@install_wxbindcore_lib_headers: 
  @COND_SHARED_0@	$(INSTALL_DIR) $(DESTDIR)$(includedir)
! @COND_SHARED_0@	for f in  wxbind/include/wxcore_bind.h wxbind/include/wxcore_wxlcore.h; do \
  @COND_SHARED_0@	if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
  @COND_SHARED_0@	$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
***************
*** 2063,2067 ****
  
  @COND_SHARED_0@uninstall_wxbindcore_lib_headers: 
! @COND_SHARED_0@	for f in  wxbind/include/wxcore_bind.h wxbind/include/wxcore_wxlprint.h; do \
  @COND_SHARED_0@	rm -f $(DESTDIR)$(includedir)/$$f; \
  @COND_SHARED_0@	done
--- 2063,2067 ----
  
  @COND_SHARED_0@uninstall_wxbindcore_lib_headers: 
! @COND_SHARED_0@	for f in  wxbind/include/wxcore_bind.h wxbind/include/wxcore_wxlcore.h; do \
  @COND_SHARED_0@	rm -f $(DESTDIR)$(includedir)/$$f; \
  @COND_SHARED_0@	done
***************
*** 2088,2092 ****
  @COND_SHARED_1@install_wxbindcore_dll_headers: 
  @COND_SHARED_1@	$(INSTALL_DIR) $(DESTDIR)$(includedir)
! @COND_SHARED_1@	for f in  wxbind/include/wxcore_bind.h wxbind/include/wxcore_wxlprint.h; do \
  @COND_SHARED_1@	if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
  @COND_SHARED_1@	$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
--- 2088,2092 ----
  @COND_SHARED_1@install_wxbindcore_dll_headers: 
  @COND_SHARED_1@	$(INSTALL_DIR) $(DESTDIR)$(includedir)
! @COND_SHARED_1@	for f in  wxbind/include/wxcore_bind.h wxbind/include/wxcore_wxlcore.h; do \
  @COND_SHARED_1@	if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
  @COND_SHARED_1@	$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
***************
*** 2096,2100 ****
  
  @COND_SHARED_1@uninstall_wxbindcore_dll_headers: 
! @COND_SHARED_1@	for f in  wxbind/include/wxcore_bind.h wxbind/include/wxcore_wxlprint.h; do \
  @COND_SHARED_1@	rm -f $(DESTDIR)$(includedir)/$$f; \
  @COND_SHARED_1@	done
--- 2096,2100 ----
  
  @COND_SHARED_1@uninstall_wxbindcore_dll_headers: 
! @COND_SHARED_1@	for f in  wxbind/include/wxcore_bind.h wxbind/include/wxcore_wxlcore.h; do \
  @COND_SHARED_1@	rm -f $(DESTDIR)$(includedir)/$$f; \
  @COND_SHARED_1@	done
***************
*** 2179,2183 ****
  @COND_SHARED_0_USE_WXBINDHTML_1@install_wxbindhtml_lib_headers: 
  @COND_SHARED_0_USE_WXBINDHTML_1@	$(INSTALL_DIR) $(DESTDIR)$(includedir)
! @COND_SHARED_0_USE_WXBINDHTML_1@	for f in  wxbind/include/wxhtml_bind.h wxbind/include/wxhtml_wxlhtmlwin.h; do \
  @COND_SHARED_0_USE_WXBINDHTML_1@	if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
  @COND_SHARED_0_USE_WXBINDHTML_1@	$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
--- 2179,2183 ----
  @COND_SHARED_0_USE_WXBINDHTML_1@install_wxbindhtml_lib_headers: 
  @COND_SHARED_0_USE_WXBINDHTML_1@	$(INSTALL_DIR) $(DESTDIR)$(includedir)
! @COND_SHARED_0_USE_WXBINDHTML_1@	for f in  wxbind/include/wxhtml_bind.h wxbind/include/wxhtml_wxlhtml.h; do \
  @COND_SHARED_0_USE_WXBINDHTML_1@	if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
  @COND_SHARED_0_USE_WXBINDHTML_1@	$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
***************
*** 2187,2191 ****
  
  @COND_SHARED_0_USE_WXBINDHTML_1@uninstall_wxbindhtml_lib_headers: 
! @COND_SHARED_0_USE_WXBINDHTML_1@	for f in  wxbind/include/wxhtml_bind.h wxbind/include/wxhtml_wxlhtmlwin.h; do \
  @COND_SHARED_0_USE_WXBINDHTML_1@	rm -f $(DESTDIR)$(includedir)/$$f; \
  @COND_SHARED_0_USE_WXBINDHTML_1@	done
--- 2187,2191 ----
  
  @COND_SHARED_0_USE_WXBINDHTML_1@uninstall_wxbindhtml_lib_headers: 
! @COND_SHARED_0_USE_WXBINDHTML_1@	for f in  wxbind/include/wxhtml_bind.h wxbind/include/wxhtml_wxlhtml.h; do \
  @COND_SHARED_0_USE_WXBINDHTML_1@	rm -f $(DESTDIR)$(includedir)/$$f; \
  @COND_SHARED_0_USE_WXBINDHTML_1@	done
***************
*** 2212,2216 ****
  @COND_SHARED_1_USE_WXBINDHTML_1@install_wxbindhtml_dll_headers: 
  @COND_SHARED_1_USE_WXBINDHTML_1@	$(INSTALL_DIR) $(DESTDIR)$(includedir)
! @COND_SHARED_1_USE_WXBINDHTML_1@	for f in  wxbind/include/wxhtml_bind.h wxbind/include/wxhtml_wxlhtmlwin.h; do \
  @COND_SHARED_1_USE_WXBINDHTML_1@	if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
  @COND_SHARED_1_USE_WXBINDHTML_1@	$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
--- 2212,2216 ----
  @COND_SHARED_1_USE_WXBINDHTML_1@install_wxbindhtml_dll_headers: 
  @COND_SHARED_1_USE_WXBINDHTML_1@	$(INSTALL_DIR) $(DESTDIR)$(includedir)
! @COND_SHARED_1_USE_WXBINDHTML_1@	for f in  wxbind/include/wxhtml_bind.h wxbind/include/wxhtml_wxlhtml.h; do \
  @COND_SHARED_1_USE_WXBINDHTML_1@	if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
  @COND_SHARED_1_USE_WXBINDHTML_1@	$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
***************
*** 2220,2224 ****
  
  @COND_SHARED_1_USE_WXBINDHTML_1@uninstall_wxbindhtml_dll_headers: 
! @COND_SHARED_1_USE_WXBINDHTML_1@	for f in  wxbind/include/wxhtml_bind.h wxbind/include/wxhtml_wxlhtmlwin.h; do \
  @COND_SHARED_1_USE_WXBINDHTML_1@	rm -f $(DESTDIR)$(includedir)/$$f; \
  @COND_SHARED_1_USE_WXBINDHTML_1@	done
--- 2220,2224 ----
  
  @COND_SHARED_1_USE_WXBINDHTML_1@uninstall_wxbindhtml_dll_headers: 
! @COND_SHARED_1_USE_WXBINDHTML_1@	for f in  wxbind/include/wxhtml_bind.h wxbind/include/wxhtml_wxlhtml.h; do \
  @COND_SHARED_1_USE_WXBINDHTML_1@	rm -f $(DESTDIR)$(includedir)/$$f; \
  @COND_SHARED_1_USE_WXBINDHTML_1@	done
***************
*** 2732,2736 ****
  @COND_INSTALL_CUSTOM_WXBIND_1@wxbindsrc: 
  @COND_INSTALL_CUSTOM_WXBIND_1@	@mkdir -p $(DESTDIR)$(prefix)/src/wxbind
! @COND_INSTALL_CUSTOM_WXBIND_1@	@for f in wxbind/src/dummy.cpp wxbind/src/wxadv_adv.cpp wxbind/src/wxadv_bind.cpp wxbind/src/wxadv_grid.cpp wxbind/src/wxaui_aui.cpp wxbind/src/wxaui_bind.cpp wxbind/src/wxbase_base.cpp wxbind/src/wxbase_bind.cpp wxbind/src/wxbase_config.cpp wxbind/src/wxbase_data.cpp wxbind/src/wxbase_datetime.cpp wxbind/src/wxbase_file.cpp wxbind/src/wxcore_appframe.cpp wxbind/src/wxcore_bind.cpp wxbind/src/wxcore_clipdrag.cpp wxbind/src/wxcore_controls.cpp wxbind/src/wxcore_core.cpp wxbind/src/wxcore_defsutils.cpp wxbind/src/wxcore_dialogs.cpp wxbind/src/wxcore_event.cpp wxbind/src/wxcore_gdi.cpp wxbind/src/wxcore_geometry.cpp wxbind/src/wxcore_help.cpp wxbind/src/wxcore_image.cpp wxbind/src/wxcore_mdi.cpp wxbind/src/wxcore_menutool.cpp wxbind/src/wxcore_picker.cpp wxbind/src/wxcore_print.cpp wxbind/src/wxcore_sizer.cpp wxbind/src/wxcore_windows.cpp wxbind/src/wxcore_wxlprint.cpp wxbind/src/wxgl_bind.cpp wxbind/src/wxgl_gl.cpp wxbind/src/wxhtml_bind.cpp wxbind/src/wxhtml_html.cpp wxbind/src/wxhtml_wxlhtmlwin.cpp wxbind/src/wxmedia_bind.cpp wxbind/src/wxmedia_media.cpp wxbind/src/wxnet_bind.cpp wxbind/src/wxnet_net.cpp wxbind/src/wxrichtext_bind.cpp wxbind/src/wxrichtext_richtext.cpp wxbind/src/wxstc_bind.cpp wxbind/src/wxstc_stc.cpp wxbind/src/wxxml_bind.cpp wxbind/src/wxxml_xml.cpp wxbind/src/wxxrc_bind.cpp wxbind/src/wxxrc_xrc.cpp; do \
  @COND_INSTALL_CUSTOM_WXBIND_1@	if test ! -f $(DESTDIR)$(prefix)/src/wxbind/$$f -a ! -d $(DESTDIR)$(prefix)/src/wxbind/$$f ; \
  @COND_INSTALL_CUSTOM_WXBIND_1@	then x=yep ; \
--- 2732,2736 ----
  @COND_INSTALL_CUSTOM_WXBIND_1@wxbindsrc: 
  @COND_INSTALL_CUSTOM_WXBIND_1@	@mkdir -p $(DESTDIR)$(prefix)/src/wxbind
! @COND_INSTALL_CUSTOM_WXBIND_1@	@for f in wxbind/src/dummy.cpp wxbind/src/wxadv_adv.cpp wxbind/src/wxadv_bind.cpp wxbind/src/wxadv_grid.cpp wxbind/src/wxaui_aui.cpp wxbind/src/wxaui_bind.cpp wxbind/src/wxbase_base.cpp wxbind/src/wxbase_bind.cpp wxbind/src/wxbase_config.cpp wxbind/src/wxbase_data.cpp wxbind/src/wxbase_datetime.cpp wxbind/src/wxbase_file.cpp wxbind/src/wxcore_appframe.cpp wxbind/src/wxcore_bind.cpp wxbind/src/wxcore_clipdrag.cpp wxbind/src/wxcore_controls.cpp wxbind/src/wxcore_core.cpp wxbind/src/wxcore_defsutils.cpp wxbind/src/wxcore_dialogs.cpp wxbind/src/wxcore_event.cpp wxbind/src/wxcore_gdi.cpp wxbind/src/wxcore_geometry.cpp wxbind/src/wxcore_help.cpp wxbind/src/wxcore_image.cpp wxbind/src/wxcore_mdi.cpp wxbind/src/wxcore_menutool.cpp wxbind/src/wxcore_picker.cpp wxbind/src/wxcore_print.cpp wxbind/src/wxcore_sizer.cpp wxbind/src/wxcore_windows.cpp wxbind/src/wxcore_wxlcore.cpp wxbind/src/wxgl_bind.cpp wxbind/src/wxgl_gl.cpp wxbind/src/wxhtml_bind.cpp wxbind/src/wxhtml_html.cpp wxbind/src/wxhtml_wxlhtml.cpp wxbind/src/wxmedia_bind.cpp wxbind/src/wxmedia_media.cpp wxbind/src/wxnet_bind.cpp wxbind/src/wxnet_net.cpp wxbind/src/wxrichtext_bind.cpp wxbind/src/wxrichtext_richtext.cpp wxbind/src/wxstc_bind.cpp wxbind/src/wxstc_stc.cpp wxbind/src/wxxml_bind.cpp wxbind/src/wxxml_xml.cpp wxbind/src/wxxrc_bind.cpp wxbind/src/wxxrc_xrc.cpp; do \
  @COND_INSTALL_CUSTOM_WXBIND_1@	if test ! -f $(DESTDIR)$(prefix)/src/wxbind/$$f -a ! -d $(DESTDIR)$(prefix)/src/wxbind/$$f ; \
  @COND_INSTALL_CUSTOM_WXBIND_1@	then x=yep ; \
***************
*** 3114,3119 ****
  	$(CXXC) -c -o $@ $(WXBINDCORE_LIB_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_windows.cpp
  
! wxbindcore_lib_wxcore_wxlprint.o: $(srcdir)/wxbind/src/wxcore_wxlprint.cpp $(WXBINDCORE_LIB_ODEP)
! 	$(CXXC) -c -o $@ $(WXBINDCORE_LIB_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_wxlprint.cpp
  
  wxbindcore_lib_dummy.o: $(srcdir)/wxbind/src/dummy.cpp $(WXBINDCORE_LIB_ODEP)
--- 3114,3119 ----
  	$(CXXC) -c -o $@ $(WXBINDCORE_LIB_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_windows.cpp
  
! wxbindcore_lib_wxcore_wxlcore.o: $(srcdir)/wxbind/src/wxcore_wxlcore.cpp $(WXBINDCORE_LIB_ODEP)
! 	$(CXXC) -c -o $@ $(WXBINDCORE_LIB_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_wxlcore.cpp
  
  wxbindcore_lib_dummy.o: $(srcdir)/wxbind/src/dummy.cpp $(WXBINDCORE_LIB_ODEP)
***************
*** 3174,3179 ****
  	$(CXXC) -c -o $@ $(WXBINDCORE_DLL_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_windows.cpp
  
! wxbindcore_dll_wxcore_wxlprint.o: $(srcdir)/wxbind/src/wxcore_wxlprint.cpp $(WXBINDCORE_DLL_ODEP)
! 	$(CXXC) -c -o $@ $(WXBINDCORE_DLL_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_wxlprint.cpp
  
  wxbindcore_dll_dummy.o: $(srcdir)/wxbind/src/dummy.cpp $(WXBINDCORE_DLL_ODEP)
--- 3174,3179 ----
  	$(CXXC) -c -o $@ $(WXBINDCORE_DLL_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_windows.cpp
  
! wxbindcore_dll_wxcore_wxlcore.o: $(srcdir)/wxbind/src/wxcore_wxlcore.cpp $(WXBINDCORE_DLL_ODEP)
! 	$(CXXC) -c -o $@ $(WXBINDCORE_DLL_CXXFLAGS) $(srcdir)/wxbind/src/wxcore_wxlcore.cpp
  
  wxbindcore_dll_dummy.o: $(srcdir)/wxbind/src/dummy.cpp $(WXBINDCORE_DLL_ODEP)
***************
*** 3204,3209 ****
  	$(CXXC) -c -o $@ $(WXBINDHTML_LIB_CXXFLAGS) $(srcdir)/wxbind/src/wxhtml_html.cpp
  
! wxbindhtml_lib_wxhtml_wxlhtmlwin.o: $(srcdir)/wxbind/src/wxhtml_wxlhtmlwin.cpp $(WXBINDHTML_LIB_ODEP)
! 	$(CXXC) -c -o $@ $(WXBINDHTML_LIB_CXXFLAGS) $(srcdir)/wxbind/src/wxhtml_wxlhtmlwin.cpp
  
  wxbindhtml_lib_dummy.o: $(srcdir)/wxbind/src/dummy.cpp $(WXBINDHTML_LIB_ODEP)
--- 3204,3209 ----
  	$(CXXC) -c -o $@ $(WXBINDHTML_LIB_CXXFLAGS) $(srcdir)/wxbind/src/wxhtml_html.cpp
  
! wxbindhtml_lib_wxhtml_wxlhtml.o: $(srcdir)/wxbind/src/wxhtml_wxlhtml.cpp $(WXBINDHTML_LIB_ODEP)
! 	$(CXXC) -c -o $@ $(WXBINDHTML_LIB_CXXFLAGS) $(srcdir)/wxbind/src/wxhtml_wxlhtml.cpp
  
  wxbindhtml_lib_dummy.o: $(srcdir)/wxbind/src/dummy.cpp $(WXBINDHTML_LIB_ODEP)
***************
*** 3216,3221 ****
  	$(CXXC) -c -o $@ $(WXBINDHTML_DLL_CXXFLAGS) $(srcdir)/wxbind/src/wxhtml_html.cpp
  
! wxbindhtml_dll_wxhtml_wxlhtmlwin.o: $(srcdir)/wxbind/src/wxhtml_wxlhtmlwin.cpp $(WXBINDHTML_DLL_ODEP)
! 	$(CXXC) -c -o $@ $(WXBINDHTML_DLL_CXXFLAGS) $(srcdir)/wxbind/src/wxhtml_wxlhtmlwin.cpp
  
  wxbindhtml_dll_dummy.o: $(srcdir)/wxbind/src/dummy.cpp $(WXBINDHTML_DLL_ODEP)
--- 3216,3221 ----
  	$(CXXC) -c -o $@ $(WXBINDHTML_DLL_CXXFLAGS) $(srcdir)/wxbind/src/wxhtml_html.cpp
  
! wxbindhtml_dll_wxhtml_wxlhtml.o: $(srcdir)/wxbind/src/wxhtml_wxlhtml.cpp $(WXBINDHTML_DLL_ODEP)
! 	$(CXXC) -c -o $@ $(WXBINDHTML_DLL_CXXFLAGS) $(srcdir)/wxbind/src/wxhtml_wxlhtml.cpp
  
  wxbindhtml_dll_dummy.o: $(srcdir)/wxbind/src/dummy.cpp $(WXBINDHTML_DLL_ODEP)