Update of /cvsroot/wxlua/wxLua
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18480
Modified Files:
Makefile.in configure
Log Message:
fixed top_builddir problems
Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.in 23 Jan 2006 21:20:28 -0000 1.6
--- Makefile.in 27 Jan 2006 21:57:05 -0000 1.7
***************
*** 14,17 ****
--- 14,19 ----
INSTALL_DIR = @INSTALL_DIR@
srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ top_builddir = @top_builddir@
libdir = @libdir@
***************
*** 33,37 ****
### Targets: ###
! all: $(__utils___depname) modules $(__apps___depname)
install: all $(__install_utils___depname) install_modules $(__install_apps___depname)
--- 35,39 ----
### Targets: ###
! all: $(top_builddir)lib $(top_builddir)bin $(__utils___depname) modules $(__apps___depname)
install: all $(__install_utils___depname) install_modules $(__install_apps___depname)
***************
*** 53,56 ****
--- 55,67 ----
distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+ rm -f ./util/Makefile
+ rm -f ./modules/Makefile
+ rm -f ./apps/Makefile
+
+ $(top_builddir)lib:
+ @mkdir -p $(top_builddir)lib
+
+ $(top_builddir)bin:
+ @mkdir -p $(top_builddir)bin
@COND_USE_UTIL_1@utils:
***************
*** 90,93 ****
--- 101,110 ----
@COND_USE_APPS_1@ (cd ./apps/ && $(MAKE) install-strip)
+ docs:
+ @echo =============================================
+ @echo Creating wxLua documentation using doxygen...
+ @echo =============================================
+ ( cd $(top_srcdir)/docs && doxygen doxygen.cfg )
+
# Include dependency info, if present:
Index: configure
===================================================================
RCS file: /cvsroot/wxlua/wxLua/configure,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** configure 23 Jan 2006 19:38:29 -0000 1.5
--- configure 27 Jan 2006 21:57:05 -0000 1.6
***************
*** 274,278 ****
PACKAGE_BUGREPORT='fr...@us...'
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CXXCPP WX_CONFIG_PATH WX_CPPFLAGS WX_CFLAGS WX_CXXFLAGS WX_CFLAGS_ONLY WX_CXXFLAGS_ONLY WX_LIBS WX_LIBS_STATIC WX_VERSION SET_MAKE MAKE_SET AR ac_ct_AR STRIP ac_ct_STRIP NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI IF_GNU_MAKE PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOS PLATFORM_MACOSX PLATFORM_OS2 PLATFORM_BEOS SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE dlldir AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG WINDOWS_IMPLIB USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_SOVERCYGWIN USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING WINDRES ac_ct_WINDRES REZ SETFILE COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MAC_1 COND_PLATFORM_OS2_1 COND_PLATFORM_WIN32_1 COND_USE_APPS_1 COND_USE_BIN2C_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_USE_UTIL_1 COND_USE_WXLUAAPP_1 COND_USE_WXLUAEDITAPP_1 COND_WINDOWS_IMPLIB_1 COND_WX_SHARED_0 COND_WX_SHARED_1 LIBOBJS LTLIBOBJS'
ac_subst_files=''
--- 274,278 ----
PACKAGE_BUGREPORT='fr...@us...'
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CXXCPP WX_CONFIG_PATH WX_CPPFLAGS WX_CFLAGS WX_CXXFLAGS WX_CFLAGS_ONLY WX_CXXFLAGS_ONLY WX_LIBS WX_LIBS_STATIC WX_VERSION WX_VERSION_MAJOR WX_VERSION_MINOR WX_PORT SET_MAKE MAKE_SET AR ac_ct_AR STRIP ac_ct_STRIP NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI IF_GNU_MAKE PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOS PLATFORM_MACOSX PLATFORM_OS2 PLATFORM_BEOS SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE dlldir AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG WINDOWS_IMPLIB USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_SOVERCYGWIN USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING WINDRES ac_ct_WINDRES REZ SETFILE COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MAC_1 COND_PLATFORM_OS2_1 COND_PLATFORM_WIN32_1 COND_USE_APPS_1 COND_USE_BIN2C_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_USE_UTIL_1 COND_USE_WXLUAAPP_1 COND_USE_WXLUAEDITAPP_1 COND_WINDOWS_IMPLIB_1 COND_WX_SHARED_0 COND_WX_SHARED_1 LIBOBJS LTLIBOBJS'
ac_subst_files=''
***************
*** 3922,3932 ****
! wx_config_major_version=`echo $WX_VERSION | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
! wx_config_minor_version=`echo $WX_VERSION | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
WX_VERSION=$wx_config_major_version$wx_config_minor_version
if test "$DBG_CONFIGURE" = "1"; then
echo "WX_VERSION: $WX_VERSION"
--- 3922,3935 ----
! WX_VERSION_MAJOR=`echo $WX_VERSION | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
! WX_VERSION_MINOR=`echo $WX_VERSION | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
WX_VERSION=$wx_config_major_version$wx_config_minor_version
+
+
+
if test "$DBG_CONFIGURE" = "1"; then
echo "WX_VERSION: $WX_VERSION"
***************
*** 4504,4507 ****
--- 4507,4511 ----
+
if test -n "" ; then
***************
*** 7265,7268 ****
--- 7269,7275 ----
s,@WX_LIBS_STATIC@,$WX_LIBS_STATIC,;t t
s,@WX_VERSION@,$WX_VERSION,;t t
+ s,@WX_VERSION_MAJOR@,$WX_VERSION_MAJOR,;t t
+ s,@WX_VERSION_MINOR@,$WX_VERSION_MINOR,;t t
+ s,@WX_PORT@,$WX_PORT,;t t
s,@SET_MAKE@,$SET_MAKE,;t t
s,@MAKE_SET@,$MAKE_SET,;t t
***************
*** 7677,7681 ****
echo " Error in this configure script ! Please contact $PACKAGE_BUGREPORT"
fi
! echo " - VERSION: $WX_VERSION"
if test "$WX_PORT" = "gtk"; then
--- 7684,7688 ----
echo " Error in this configure script ! Please contact $PACKAGE_BUGREPORT"
fi
! echo " - VERSION: $WX_VERSION_MAJOR.$WX_VERSION_MINOR"
if test "$WX_PORT" = "gtk"; then
|
