orbital-eunuchs-sniper (1.30+svn20070601-2) debianized-build.patch

Summary

 configure       |   21 ++++----
 configure.ac    |   20 ++++----
 src/Makefile.am |   19 -------
 src/Makefile.in |  137 +++++++++++++++++---------------------------------------
 4 files changed, 64 insertions(+), 133 deletions(-)

    
download this patch

Patch contents

Description: Upstream has a few time-wasting sillinesses in the configure
 system, and builds a needlessly static binary which is not useful.
Author: Kees Cook <kees@debian.org>
Forwarded: not-needed

--- orbital-eunuchs-sniper-1.30+svn20070601.orig/configure
+++ orbital-eunuchs-sniper-1.30+svn20070601/configure
@@ -7315,19 +7315,19 @@ CPU_IS=`uname -m`
 
 
 echo $ac_n "ordering crap from http://www.amazon.com/gp/registry/296ST2NHEBO0Z" 1>&6
-sleep 1
-echo $ac_n ".$ac_c" 1>&6
-sleep 1
-echo $ac_n ".$ac_c" 1>&6
-sleep 1
-echo $ac_n ".$ac_c" 1>&6
-sleep 1
-echo $ac_n ".$ac_c" 1>&6
-sleep 1
+#sleep 1
+#echo $ac_n ".$ac_c" 1>&6
+#sleep 1
+#echo $ac_n ".$ac_c" 1>&6
+#sleep 1
+#echo $ac_n ".$ac_c" 1>&6
+#sleep 1
+#echo $ac_n ".$ac_c" 1>&6
+#sleep 1
 { echo "$as_me:$LINENO: result:  complete!" >&5
 echo "${ECHO_T} complete!" >&6; }
 
-ac_config_files="$ac_config_files Makefile src/Makefile bin/Makefile src/snipe2d"
+ac_config_files="$ac_config_files Makefile src/Makefile bin/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -7918,7 +7918,6 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "bin/Makefile") CONFIG_FILES="$CONFIG_FILES bin/Makefile" ;;
-    "src/snipe2d") CONFIG_FILES="$CONFIG_FILES src/snipe2d" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
--- orbital-eunuchs-sniper-1.30+svn20070601.orig/configure.ac
+++ orbital-eunuchs-sniper-1.30+svn20070601/configure.ac
@@ -75,16 +75,16 @@ AC_SUBST(CPU_IS,`uname -m`)
 
 
 echo $ac_n "ordering crap from http://www.amazon.com/gp/registry/296ST2NHEBO0Z" 1>&6
-sleep 1
-echo $ac_n ".$ac_c" 1>&6
-sleep 1
-echo $ac_n ".$ac_c" 1>&6
-sleep 1
-echo $ac_n ".$ac_c" 1>&6
-sleep 1
-echo $ac_n ".$ac_c" 1>&6
-sleep 1
+#sleep 1
+#echo $ac_n ".$ac_c" 1>&6
+#sleep 1
+#echo $ac_n ".$ac_c" 1>&6
+#sleep 1
+#echo $ac_n ".$ac_c" 1>&6
+#sleep 1
+#echo $ac_n ".$ac_c" 1>&6
+#sleep 1
 AC_MSG_RESULT([ complete!])
 
-AC_CONFIG_FILES([Makefile src/Makefile bin/Makefile src/snipe2d])
+AC_CONFIG_FILES([Makefile src/Makefile bin/Makefile])
 AC_OUTPUT
--- orbital-eunuchs-sniper-1.30+svn20070601.orig/src/Makefile.am
+++ orbital-eunuchs-sniper-1.30+svn20070601/src/Makefile.am
@@ -1,7 +1,5 @@
-pkgdata_PROGRAMS = snipe2d.@CPU_IS@.dynamic snipe2d.@CPU_IS@.static
-BUILT_SOURCES = snipe2d
-bin_SCRIPTS = snipe2d
-snipe2d_common = \
+bin_PROGRAMS = snipe2d
+snipe2d_SOURCES = \
  ai.cpp \
  binds.cpp \
  binds.h \
@@ -27,16 +25,3 @@ snipe2d_common = \
  sexpr/faststack.c \
  sexpr/io.c \
  sexpr/parser.c
-
-snipe2d_@CPU_IS@_dynamic_SOURCES = $(snipe2d_common)
-
-#snipe2d_@CPU_IS@_static_LDFLAGS = -static
-snipe2d_@CPU_IS@_static_SOURCES = $(snipe2d_common)
-
-#Hardcore on the .static
-snipe2d.@CPU_IS@.static$(EXEEXT): $(snipe2d_@CPU_IS@_static_OBJECTS) $(snipe2d_@CPU_IS@_static_DEPENDENCIES)
-	@rm -f snipe2d.@CPU_IS@.static$(EXEEXT)
-#	$(CXXLINK) $(snipe2d_@CPU_IS@_static_LDFLAGS) $(snipe2d_@CPU_IS@_static_OBJECTS) $(snipe2d_@CPU_IS@_static_LDADD) -Xlinker -static -Xlinker -lSDL -Xlinker -lSDL_image -Xlinker -shared -shared
-#	$(CXXLINK) $(snipe2d_@CPU_IS@_static_LDFLAGS) $(snipe2d_@CPU_IS@_static_OBJECTS) $(snipe2d_@CPU_IS@_static_LDADD) -Xlinker -static -Xlinker -lSDL -Xlinker -lSDL_image -Xlinker -shared -shared
-	touch $@
-#I give up.  Can't figure out partial static.  --phaethon
--- orbital-eunuchs-sniper-1.30+svn20070601.orig/src/Makefile.in
+++ orbital-eunuchs-sniper-1.30+svn20070601/src/Makefile.in
@@ -14,7 +14,6 @@
 
 @SET_MAKE@
 
-
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -34,37 +33,27 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-pkgdata_PROGRAMS = snipe2d.@CPU_IS@.dynamic$(EXEEXT) \
-	snipe2d.@CPU_IS@.static$(EXEEXT)
+bin_PROGRAMS = snipe2d$(EXEEXT)
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/snipe2d.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = snipe2d
-am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(bindir)"
-pkgdataPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(pkgdata_PROGRAMS)
-am__objects_1 = ai.$(OBJEXT) binds.$(OBJEXT) gameover.$(OBJEXT) \
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS)
+am_snipe2d_OBJECTS = ai.$(OBJEXT) binds.$(OBJEXT) gameover.$(OBJEXT) \
 	highscores.$(OBJEXT) logoscreen.$(OBJEXT) petopt.$(OBJEXT) \
 	prefs.$(OBJEXT) prints.$(OBJEXT) render_ai.$(OBJEXT) \
 	snipe2d.$(OBJEXT) target.$(OBJEXT) ui.$(OBJEXT) \
 	zooms.$(OBJEXT) sexp.$(OBJEXT) sexp_ops.$(OBJEXT) \
 	faststack.$(OBJEXT) io.$(OBJEXT) parser.$(OBJEXT)
-am_snipe2d_@CPU_IS@_dynamic_OBJECTS = $(am__objects_1)
-snipe2d_@CPU_IS@_dynamic_OBJECTS =  \
-	$(am_snipe2d_@CPU_IS@_dynamic_OBJECTS)
-snipe2d_@CPU_IS@_dynamic_LDADD = $(LDADD)
-am_snipe2d_@CPU_IS@_static_OBJECTS = $(am__objects_1)
-snipe2d_@CPU_IS@_static_OBJECTS =  \
-	$(am_snipe2d_@CPU_IS@_static_OBJECTS)
-snipe2d_@CPU_IS@_static_LDADD = $(LDADD)
-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-SCRIPTS = $(bin_SCRIPTS)
+snipe2d_OBJECTS = $(am_snipe2d_OBJECTS)
+snipe2d_LDADD = $(LDADD)
 DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -77,10 +66,8 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_IN
 CXXLD = $(CXX)
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
-SOURCES = $(snipe2d_@CPU_IS@_dynamic_SOURCES) \
-	$(snipe2d_@CPU_IS@_static_SOURCES)
-DIST_SOURCES = $(snipe2d_@CPU_IS@_dynamic_SOURCES) \
-	$(snipe2d_@CPU_IS@_static_SOURCES)
+SOURCES = $(snipe2d_SOURCES)
+DIST_SOURCES = $(snipe2d_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -191,9 +178,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-BUILT_SOURCES = snipe2d
-bin_SCRIPTS = snipe2d
-snipe2d_common = \
+snipe2d_SOURCES = \
  ai.cpp \
  binds.cpp \
  binds.h \
@@ -220,12 +205,7 @@ snipe2d_common = \
  sexpr/io.c \
  sexpr/parser.c
 
-snipe2d_@CPU_IS@_dynamic_SOURCES = $(snipe2d_common)
-
-#snipe2d_@CPU_IS@_static_LDFLAGS = -static
-snipe2d_@CPU_IS@_static_SOURCES = $(snipe2d_common)
-all: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) all-am
+all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .cpp .o .obj
@@ -258,54 +238,33 @@ $(top_srcdir)/configure:  $(am__configur
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-snipe2d: $(top_builddir)/config.status $(srcdir)/snipe2d.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-install-pkgdataPROGRAMS: $(pkgdata_PROGRAMS)
+install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
-	@list='$(pkgdata_PROGRAMS)'; for p in $$list; do \
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(pkgdataPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(pkgdataPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(pkgdatadir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
-uninstall-pkgdataPROGRAMS:
+uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(pkgdata_PROGRAMS)'; for p in $$list; do \
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
-	done
-
-clean-pkgdataPROGRAMS:
-	-test -z "$(pkgdata_PROGRAMS)" || rm -f $(pkgdata_PROGRAMS)
-snipe2d.@CPU_IS@.dynamic$(EXEEXT): $(snipe2d_@CPU_IS@_dynamic_OBJECTS) $(snipe2d_@CPU_IS@_dynamic_DEPENDENCIES) 
-	@rm -f snipe2d.@CPU_IS@.dynamic$(EXEEXT)
-	$(CXXLINK) $(snipe2d_@CPU_IS@_dynamic_OBJECTS) $(snipe2d_@CPU_IS@_dynamic_LDADD) $(LIBS)
-install-binSCRIPTS: $(bin_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f $$d$$p; then \
-	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	    $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
-	  else :; fi; \
-	done
-
-uninstall-binSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
 	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 	done
 
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+snipe2d$(EXEEXT): $(snipe2d_OBJECTS) $(snipe2d_DEPENDENCIES) 
+	@rm -f snipe2d$(EXEEXT)
+	$(CXXLINK) $(snipe2d_OBJECTS) $(snipe2d_LDADD) $(LIBS)
+
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
@@ -504,15 +463,13 @@ distdir: $(DISTFILES)
 	  fi; \
 	done
 check-am: all-am
-check: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(PROGRAMS) $(SCRIPTS)
+check: check-am
+all-am: Makefile $(PROGRAMS)
 installdirs:
-	for dir in "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(bindir)"; do \
+	for dir in "$(DESTDIR)$(bindir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
-install: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) install-am
+install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -536,10 +493,9 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-am
 
-clean-am: clean-generic clean-pkgdataPROGRAMS mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
@@ -557,11 +513,11 @@ info: info-am
 
 info-am:
 
-install-data-am: install-pkgdataPROGRAMS
+install-data-am:
 
 install-dvi: install-dvi-am
 
-install-exec-am: install-binSCRIPTS
+install-exec-am: install-binPROGRAMS
 
 install-html: install-html-am
 
@@ -592,32 +548,23 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binSCRIPTS uninstall-pkgdataPROGRAMS
+uninstall-am: uninstall-binPROGRAMS
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-pkgdataPROGRAMS ctags distclean distclean-compile \
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic ctags distclean distclean-compile \
 	distclean-generic distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binSCRIPTS \
+	html-am info info-am install install-am install-binPROGRAMS \
 	install-data install-data-am install-dvi install-dvi-am \
 	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-pkgdataPROGRAMS install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
-	ps ps-am tags uninstall uninstall-am uninstall-binSCRIPTS \
-	uninstall-pkgdataPROGRAMS
-
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-binPROGRAMS
 
-#Hardcore on the .static
-snipe2d.@CPU_IS@.static$(EXEEXT): $(snipe2d_@CPU_IS@_static_OBJECTS) $(snipe2d_@CPU_IS@_static_DEPENDENCIES)
-	@rm -f snipe2d.@CPU_IS@.static$(EXEEXT)
-#	$(CXXLINK) $(snipe2d_@CPU_IS@_static_LDFLAGS) $(snipe2d_@CPU_IS@_static_OBJECTS) $(snipe2d_@CPU_IS@_static_LDADD) -Xlinker -static -Xlinker -lSDL -Xlinker -lSDL_image -Xlinker -shared -shared
-#	$(CXXLINK) $(snipe2d_@CPU_IS@_static_LDFLAGS) $(snipe2d_@CPU_IS@_static_OBJECTS) $(snipe2d_@CPU_IS@_static_LDADD) -Xlinker -static -Xlinker -lSDL -Xlinker -lSDL_image -Xlinker -shared -shared
-	touch $@
-#I give up.  Can't figure out partial static.  --phaethon
 # 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: