[Tux4kids-commits] r44 - in tuxmath/trunk: . src
dbruce at alioth.debian.org
dbruce at alioth.debian.org
Thu Mar 8 21:15:39 CET 2007
Author: dbruce
Date: 2006-10-04 01:39:41 +0000 (Wed, 04 Oct 2006)
New Revision: 44
Modified:
tuxmath/trunk/Makefile
tuxmath/trunk/Makefile.am
tuxmath/trunk/Makefile.in
tuxmath/trunk/configure
tuxmath/trunk/configure.in
tuxmath/trunk/src/Makefile.in
Log:
nsis integration
Modified: tuxmath/trunk/Makefile
===================================================================
--- tuxmath/trunk/Makefile 2006-10-03 22:28:23 UTC (rev 43)
+++ tuxmath/trunk/Makefile 2006-10-04 01:39:41 UTC (rev 44)
@@ -17,9 +17,9 @@
srcdir = .
top_srcdir = .
-pkgdatadir = $(datadir)/TuxMath
-pkglibdir = $(libdir)/TuxMath
-pkgincludedir = $(includedir)/TuxMath
+pkgdatadir = $(datadir)/tuxmath
+pkglibdir = $(libdir)/tuxmath
+pkgincludedir = $(includedir)/tuxmath
top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = /usr/bin/install -c
@@ -39,9 +39,9 @@
target_triplet = i686-pc-linux-gnu
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
- config.guess config.sub depcomp install-sh missing \
- mkinstalldirs
+ $(top_srcdir)/configure $(top_srcdir)/nsis/tuxmath.nsi.in \
+ AUTHORS COPYING ChangeLog INSTALL NEWS config.guess config.sub \
+ depcomp install-sh missing mkinstalldirs
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -52,7 +52,7 @@
configure.lineno configure.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = nsis/tuxmath.nsi
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -119,9 +119,14 @@
MAINTAINER_MODE_FALSE =
MAINTAINER_MODE_TRUE = #
MAKEINFO = makeinfo
-NAME_VERSION = TuxMath-0.96
+NAME_VERSION = tuxmath-0.96
+NSIS = no
+NSI_BUILD_FALSE = #
+NSI_BUILD_TRUE =
+NSI_DLL_DIR = /home/dbruce/tuxmath_dll
+NSI_INSTALL_DIR = mingw32
OBJEXT = o
-PACKAGE = TuxMath
+PACKAGE = tuxmath
PACKAGE_BUGREPORT =
PACKAGE_DATA_DIR = data
PACKAGE_NAME =
@@ -137,6 +142,7 @@
SHELL = /bin/sh
STRIP =
VERSION = 0.96
+WINDRES =
ac_ct_CC = gcc
ac_ct_STRIP =
am__fastdepCC_FALSE = #
@@ -178,7 +184,9 @@
target_cpu = i686
target_os = linux-gnu
target_vendor = pc
+MAKENSIS = no
SUBDIRS = src
+MY_RECURSIVE_TARGETS = install-nsi
icondir = $(datadir)/pixmaps
icon_DATA = data/images/icon.png
all: config.h
@@ -235,6 +243,8 @@
distclean-hdr:
-rm -f config.h stamp-h1
+nsis/tuxmath.nsi: $(top_builddir)/config.status $(top_srcdir)/nsis/tuxmath.nsi.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
uninstall-info-am:
install-iconDATA: $(icon_DATA)
@$(NORMAL_INSTALL)
@@ -389,6 +399,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
+ $(mkdir_p) $(distdir)/nsis
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -561,7 +572,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-recursive
-clean-am: clean-generic mostlyclean-am
+clean-am: clean-generic clean-local mostlyclean-am
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -611,7 +622,7 @@
uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
- check-am clean clean-generic clean-recursive ctags \
+ check-am clean clean-generic clean-local clean-recursive ctags \
ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
dist-tarZ dist-zip distcheck distclean distclean-generic \
distclean-hdr distclean-recursive distclean-tags \
@@ -627,12 +638,54 @@
uninstall-iconDATA uninstall-info-am
+$(MY_RECURSIVE_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
install-data-local:
@$(NORMAL_INSTALL)
if test -d $(srcdir)/$(PACKAGE_DATA_DIR); then \
$(mkinstalldirs) $(DESTDIR)/$(pkgdatadir); \
cd $(srcdir)/$(PACKAGE_DATA_DIR) ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "1[1-9].ogg" --exclude "2?.ogg" * | ( cd $(DESTDIR)/$(pkgdatadir) ; tar xf -) ; cd .. ; \
fi
+
+install-nsi-local: all
+ $(INSTALL) -d $(top_srcdir)/$(NSI_INSTALL_DIR)/$(PACKAGE_DATA_DIR);
+ (cd $(top_srcdir)/$(PACKAGE_DATA_DIR) ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "1[1-9].ogg" --exclude "2?.ogg" * )| ( cd $(top_srcdir)/$(NSI_INSTALL_DIR)/$(PACKAGE_DATA_DIR) ; tar xf -) ; cd .. ;
+ cp $(NSI_DLL_DIR)/*.dll $(top_srcdir)/$(NSI_INSTALL_DIR)
+
+install-nsi-am: install-nsi-local
+
+nsis: install-nsi
+ $(MAKENSIS) -NOCD nsis/tuxmath.nsi
+
+clean-local:
+ @$(NORMAL_CLEAN)
+ if test -d $(NSI_INSTALL_DIR); then \
+ rm -fr $(NSI_INSTALL_DIR); \
+ fi
+ -rm tuxmath-0.96-win32-installer.exe
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: tuxmath/trunk/Makefile.am
===================================================================
--- tuxmath/trunk/Makefile.am 2006-10-03 22:28:23 UTC (rev 43)
+++ tuxmath/trunk/Makefile.am 2006-10-04 01:39:41 UTC (rev 44)
@@ -1,5 +1,38 @@
+MAKENSIS=@NSIS@
+
SUBDIRS = src
+NSI_INSTALL_DIR=@NSI_INSTALL_DIR@
+NSI_DLL_DIR=@NSI_DLL_DIR@
+
+MY_RECURSIVE_TARGETS = install-nsi
+
+$(MY_RECURSIVE_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+
icondir=$(datadir)/pixmaps
icon_DATA = data/images/icon.png
@@ -10,3 +43,19 @@
cd $(srcdir)/$(PACKAGE_DATA_DIR) ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "1[1-9].ogg" --exclude "2?.ogg" * | ( cd $(DESTDIR)/$(pkgdatadir) ; tar xf -) ; cd .. ; \
fi
+install-nsi-local: all
+ $(INSTALL) -d $(top_srcdir)/$(NSI_INSTALL_DIR)/$(PACKAGE_DATA_DIR);
+ (cd $(top_srcdir)/$(PACKAGE_DATA_DIR) ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "1[1-9].ogg" --exclude "2?.ogg" * )| ( cd $(top_srcdir)/$(NSI_INSTALL_DIR)/$(PACKAGE_DATA_DIR) ; tar xf -) ; cd .. ;
+ cp $(NSI_DLL_DIR)/*.dll $(top_srcdir)/$(NSI_INSTALL_DIR)
+
+install-nsi-am: install-nsi-local
+
+nsis: install-nsi
+ $(MAKENSIS) -NOCD nsis/tuxmath.nsi
+
+clean-local:
+ @$(NORMAL_CLEAN)
+ if test -d $(NSI_INSTALL_DIR); then \
+ rm -fr $(NSI_INSTALL_DIR); \
+ fi
+ -rm tuxmath- at VERSION@-win32-installer.exe
Modified: tuxmath/trunk/Makefile.in
===================================================================
--- tuxmath/trunk/Makefile.in 2006-10-03 22:28:23 UTC (rev 43)
+++ tuxmath/trunk/Makefile.in 2006-10-04 01:39:41 UTC (rev 44)
@@ -39,9 +39,9 @@
target_triplet = @target@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
- config.guess config.sub depcomp install-sh missing \
- mkinstalldirs
+ $(top_srcdir)/configure $(top_srcdir)/nsis/tuxmath.nsi.in \
+ AUTHORS COPYING ChangeLog INSTALL NEWS config.guess config.sub \
+ depcomp install-sh missing mkinstalldirs
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -52,7 +52,7 @@
configure.lineno configure.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = nsis/tuxmath.nsi
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -120,6 +120,11 @@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
NAME_VERSION = @NAME_VERSION@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -137,6 +142,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
@@ -178,7 +184,9 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+MAKENSIS = @NSIS@
SUBDIRS = src
+MY_RECURSIVE_TARGETS = install-nsi
icondir = $(datadir)/pixmaps
icon_DATA = data/images/icon.png
all: config.h
@@ -235,6 +243,8 @@
distclean-hdr:
-rm -f config.h stamp-h1
+nsis/tuxmath.nsi: $(top_builddir)/config.status $(top_srcdir)/nsis/tuxmath.nsi.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
uninstall-info-am:
install-iconDATA: $(icon_DATA)
@$(NORMAL_INSTALL)
@@ -389,6 +399,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
+ $(mkdir_p) $(distdir)/nsis
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -561,7 +572,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-recursive
-clean-am: clean-generic mostlyclean-am
+clean-am: clean-generic clean-local mostlyclean-am
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -611,7 +622,7 @@
uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
- check-am clean clean-generic clean-recursive ctags \
+ check-am clean clean-generic clean-local clean-recursive ctags \
ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
dist-tarZ dist-zip distcheck distclean distclean-generic \
distclean-hdr distclean-recursive distclean-tags \
@@ -627,12 +638,54 @@
uninstall-iconDATA uninstall-info-am
+$(MY_RECURSIVE_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
install-data-local:
@$(NORMAL_INSTALL)
if test -d $(srcdir)/$(PACKAGE_DATA_DIR); then \
$(mkinstalldirs) $(DESTDIR)/$(pkgdatadir); \
cd $(srcdir)/$(PACKAGE_DATA_DIR) ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "1[1-9].ogg" --exclude "2?.ogg" * | ( cd $(DESTDIR)/$(pkgdatadir) ; tar xf -) ; cd .. ; \
fi
+
+install-nsi-local: all
+ $(INSTALL) -d $(top_srcdir)/$(NSI_INSTALL_DIR)/$(PACKAGE_DATA_DIR);
+ (cd $(top_srcdir)/$(PACKAGE_DATA_DIR) ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "1[1-9].ogg" --exclude "2?.ogg" * )| ( cd $(top_srcdir)/$(NSI_INSTALL_DIR)/$(PACKAGE_DATA_DIR) ; tar xf -) ; cd .. ;
+ cp $(NSI_DLL_DIR)/*.dll $(top_srcdir)/$(NSI_INSTALL_DIR)
+
+install-nsi-am: install-nsi-local
+
+nsis: install-nsi
+ $(MAKENSIS) -NOCD nsis/tuxmath.nsi
+
+clean-local:
+ @$(NORMAL_CLEAN)
+ if test -d $(NSI_INSTALL_DIR); then \
+ rm -fr $(NSI_INSTALL_DIR); \
+ fi
+ -rm tuxmath- at VERSION@-win32-installer.exe
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: tuxmath/trunk/configure
===================================================================
--- tuxmath/trunk/configure 2006-10-03 22:28:23 UTC (rev 43)
+++ tuxmath/trunk/configure 2006-10-04 01:39:41 UTC (rev 44)
@@ -861,6 +861,9 @@
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-sdl-prefix=PFX Prefix where SDL is installed (optional)
--with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)
+ --with-dll-directory=path
+ set the path where dll for TuxMath are
+ $(NSI_DLL_DIR)
Some influential environment variables:
CC C compiler command
@@ -1698,7 +1701,7 @@
# Define the identity of the package.
- PACKAGE=TuxMath
+ PACKAGE=tuxmath
VERSION=0.96
@@ -4854,13 +4857,124 @@
LIBS="$LIBS -lgw32c -luuid -lole32 -lwsock32 -mwindows"
CPPFLAGS="$CPPFLAGS -idirafter $prefix/include/glibc"
#CPPFLAGS="$CPPFLAGS -I$prefix/include/glibc"
+ # Extract the first word of ""$target_alias-windres"", so it can be a program name with args.
+set dummy "$target_alias-windres"; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_WINDRES+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $WINDRES in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_WINDRES="$WINDRES" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_WINDRES="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ test -z "$ac_cv_path_WINDRES" && ac_cv_path_WINDRES="no"
+ ;;
+esac
fi
+WINDRES=$ac_cv_path_WINDRES
+if test -n "$WINDRES"; then
+ echo "$as_me:$LINENO: result: $WINDRES" >&5
+echo "${ECHO_T}$WINDRES" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+fi
+
+
+NSI_INSTALL_DIR=mingw32
+NSI_DLL_DIR=~/tuxmath_dll
+
+
+# Check whether --with-dll-directory or --without-dll-directory was given.
+if test "${with_dll_directory+set}" = set; then
+ withval="$with_dll_directory"
+ dll_path=$withval
+else
+ dll_path=no
+fi;
+
+
+
+if test "$dll_path" = no; then
+ NSI_BUILD_TRUE=
+ NSI_BUILD_FALSE='#'
+else
+ NSI_BUILD_TRUE='#'
+ NSI_BUILD_FALSE=
+fi
+
+
+
+
+
+if test $dll_path != no; then
+NSI_DLL_DIR=$dll_path
+fi
+
+# Extract the first word of "makensis", so it can be a program name with args.
+set dummy makensis; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_NSIS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $NSIS in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_NSIS="$NSIS" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_NSIS="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ test -z "$ac_cv_path_NSIS" && ac_cv_path_NSIS="no"
+ ;;
+esac
+fi
+NSIS=$ac_cv_path_NSIS
+
+if test -n "$NSIS"; then
+ echo "$as_me:$LINENO: result: $NSIS" >&5
+echo "${ECHO_T}$NSIS" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
#AC_CONFIG_FILES([Makefile])
- ac_config_files="$ac_config_files Makefile src/Makefile"
+ ac_config_files="$ac_config_files Makefile src/Makefile nsis/tuxmath.nsi"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -4980,6 +5094,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${NSI_BUILD_TRUE}" && test -z "${NSI_BUILD_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"NSI_BUILD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"NSI_BUILD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -5426,6 +5547,7 @@
# Handling of arguments.
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+ "nsis/tuxmath.nsi" ) CONFIG_FILES="$CONFIG_FILES nsis/tuxmath.nsi" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
@@ -5576,7 +5698,13 @@
s, at LIBOBJS@,$LIBOBJS,;t t
s, at BUILD_MINGW32_TRUE@,$BUILD_MINGW32_TRUE,;t t
s, at BUILD_MINGW32_FALSE@,$BUILD_MINGW32_FALSE,;t t
+s, at WINDRES@,$WINDRES,;t t
s, at PACKAGE_DATA_DIR@,$PACKAGE_DATA_DIR,;t t
+s, at NSI_BUILD_TRUE@,$NSI_BUILD_TRUE,;t t
+s, at NSI_BUILD_FALSE@,$NSI_BUILD_FALSE,;t t
+s, at NSI_INSTALL_DIR@,$NSI_INSTALL_DIR,;t t
+s, at NSI_DLL_DIR@,$NSI_DLL_DIR,;t t
+s, at NSIS@,$NSIS,;t t
s, at LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
Modified: tuxmath/trunk/configure.in
===================================================================
--- tuxmath/trunk/configure.in 2006-10-03 22:28:23 UTC (rev 43)
+++ tuxmath/trunk/configure.in 2006-10-04 01:39:41 UTC (rev 44)
@@ -6,7 +6,7 @@
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(TuxMath, 0.96)
+AM_INIT_AUTOMAKE(tuxmath, 0.96)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
@@ -82,14 +82,33 @@
LIBS="$LIBS -lgw32c -luuid -lole32 -lwsock32 -mwindows"
CPPFLAGS="$CPPFLAGS -idirafter $prefix/include/glibc"
#CPPFLAGS="$CPPFLAGS -I$prefix/include/glibc"
+ AC_PATH_PROG(WINDRES, "$target_alias-windres", no, [$PATH])
fi
AC_SUBST(PACKAGE_DATA_DIR)
+NSI_INSTALL_DIR=mingw32
+NSI_DLL_DIR=~/tuxmath_dll
+
+AC_ARG_WITH(dll-directory,AC_HELP_STRING(
+ [--with-dll-directory=path],
+ [set the path where dll for TuxMath are [$(NSI_DLL_DIR)]]), dll_path=$withval, dll_path=no)
+
+AM_CONDITIONAL(NSI_BUILD, test "$dll_path" = no)
+
+AC_SUBST(NSI_INSTALL_DIR)
+AC_SUBST(NSI_DLL_DIR)
+
+if test $dll_path != no; then
+NSI_DLL_DIR=$dll_path
+fi
+
+AC_PATH_PROG(NSIS, makensis, no, [$PATH])
+
#AC_CONFIG_FILES([Makefile])
AC_OUTPUT([
Makefile
src/Makefile
-
+nsis/tuxmath.nsi
])
\ No newline at end of file
Modified: tuxmath/trunk/src/Makefile.in
===================================================================
--- tuxmath/trunk/src/Makefile.in 2006-10-03 22:28:23 UTC (rev 43)
+++ tuxmath/trunk/src/Makefile.in 2006-10-04 01:39:41 UTC (rev 44)
@@ -37,7 +37,8 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-bin_PROGRAMS = tuxmath$(EXEEXT)
+ at BUILD_MINGW32_FALSE@bin_PROGRAMS = tuxmath$(EXEEXT)
+ at BUILD_MINGW32_TRUE@bin_PROGRAMS = TuxMath$(EXEEXT)
subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -51,6 +52,12 @@
am__installdirs = "$(DESTDIR)$(bindir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
+am_TuxMath_OBJECTS = tuxmath.$(OBJEXT) setup.$(OBJEXT) title.$(OBJEXT) \
+ game.$(OBJEXT) options.$(OBJEXT) credits.$(OBJEXT) \
+ playsound.$(OBJEXT) mathcards.$(OBJEXT) fileops.$(OBJEXT) \
+ tuxmathrc.$(OBJEXT)
+TuxMath_OBJECTS = $(am_TuxMath_OBJECTS)
+TuxMath_LDADD = $(LDADD)
am_tuxmath_OBJECTS = tuxmath.$(OBJEXT) setup.$(OBJEXT) title.$(OBJEXT) \
game.$(OBJEXT) options.$(OBJEXT) credits.$(OBJEXT) \
playsound.$(OBJEXT) mathcards.$(OBJEXT) fileops.$(OBJEXT)
@@ -63,8 +70,8 @@
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(tuxmath_SOURCES)
-DIST_SOURCES = $(tuxmath_SOURCES)
+SOURCES = $(TuxMath_SOURCES) $(tuxmath_SOURCES)
+DIST_SOURCES = $(TuxMath_SOURCES) $(tuxmath_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -104,6 +111,11 @@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
NAME_VERSION = @NAME_VERSION@
+NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
+NSI_DLL_DIR = @NSI_DLL_DIR@
+NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -121,6 +133,7 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WINDRES = @WINDRES@
ac_ct_CC = @ac_ct_CC@
ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
@@ -162,10 +175,16 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+ at BUILD_MINGW32_FALSE@TUXMATHRC =
+TuxMath_SOURCES = tuxmath.c setup.c title.c game.c \
+ options.c credits.c playsound.c \
+ mathcards.c fileops.c tuxmathrc.c
+
tuxmath_SOURCES = tuxmath.c setup.c title.c game.c \
options.c credits.c playsound.c \
mathcards.c fileops.c
+MY_RECURSIVE_TARGETS = install-nsi
@BUILD_MINGW32_FALSE at DATA_PREFIX = ${pkgdatadir}
@BUILD_MINGW32_TRUE at DATA_PREFIX = @PACKAGE_DATA_DIR@
AM_CFLAGS = -Wall -g -DDATA_PREFIX=\"${DATA_PREFIX}\" -DDEBUG \
@@ -227,6 +246,9 @@
clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+TuxMath$(EXEEXT): $(TuxMath_OBJECTS) $(TuxMath_DEPENDENCIES)
+ @rm -f TuxMath$(EXEEXT)
+ $(LINK) $(TuxMath_LDFLAGS) $(TuxMath_OBJECTS) $(TuxMath_LDADD) $(LIBS)
tuxmath$(EXEEXT): $(tuxmath_OBJECTS) $(tuxmath_DEPENDENCIES)
@rm -f tuxmath$(EXEEXT)
$(LINK) $(tuxmath_LDFLAGS) $(tuxmath_OBJECTS) $(tuxmath_LDADD) $(LIBS)
@@ -246,6 +268,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/setup.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/title.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tuxmath.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tuxmathrc.Po at am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -428,6 +451,41 @@
mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
uninstall-am uninstall-binPROGRAMS uninstall-info-am
+
+$(MY_RECURSIVE_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+install-nsi-local: all
+ $(INSTALL) -d $(top_srcdir)/$(NSI_INSTALL_DIR)/$(PACKAGE_DATA_DIR);
+ $(INSTALL) TuxMath.exe $(top_srcdir)/$(NSI_INSTALL_DIR)
+
+install-nsi-am: install-nsi-local
+
+# How to make an RC file
+tuxmathrc.o: tuxmathrc.rc
+ $(WINDRES) -i $< -o $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
More information about the Tux4kids-commits
mailing list