Changeset 609Tweet

Timestamp:

May 8, 2011, 5:32:52 PM (12 years ago)

Author:

Sam Hocevar

Message:

build: allow to specify --disable-nonfree to avoid installing non-free data
and build stripped down tarballs.

Location:

abuse/trunk

Files:

• INSTALL (modified) (4 diffs)
• Makefile.am (modified) (1 diff)
• PACKAGERS (added)
• configure.ac (modified) (2 diffs)
• data/Makefile.am (modified) (5 diffs)

abuse/trunk/INSTALL

@@ -1 @@
-Requirements for Compiling
+Requirements for compiling
 --------------------------
+
 - SDL 1.1.6 <http://www.libsdl.org>
-- X11R6(or above) and libraries.
-- Linux kernel 2.2 or above.
+- SDL-Mixer
 - GL libraries and headers are required for OpenGL support.
 
@@ -10 +10 @@
 ---------
 
-1. Untar the abuse_sdl-x.x.tar.gz file.
+1. Untar the abuse-x.x.tar.gz file.
 
-     tar -zxf abuse_sdl-x.x.tar.gz
+     tar xzf abuse-x.x.tar.gz
 
-   This will create an abuse_sdl-x.x directory with the source in it.
+   This will create an abuse-x.x directory with the source in it.
 
 2. Run  './configure'
-   This will create the Makefiles required to build Abuse-SDL.
+   This will create the Makefiles required to build Abuse.
 
    If you wish to specify a location for the datafiles instead of using the
@@ -23 +23 @@
    following argument to the configure script:
 
-     --datafir=<location>
+     --datadir=<location>
 
    where <location> is the directory where the datafiles will be installed.
@@ -31 +31 @@
 
 4. Run 'make install'
-   This will install Abuse-SDL.
+   This will install Abuse.
 
 
-MacOSX
-------
+Mac OS X
+--------
+
 A Project Builder project is included in the 'osx' directory and can be used
 if desired.  Using project Builder is currently the only way to get OpenGL
 support compiled in.
 
-
-If anything goes wrong please contact me at <trandor@labyrinth.net.au> with
-the details, and I'll try and sort it out.
-
-Good luck,
-Anthony Kruize

abuse/trunk/Makefile.am

@@ -8 +8 @@
 datafile_DATA = abuse.bmp abuse.png
 
-EXTRA_DIST = bootstrap abuse.bmp abuse.png
+EXTRA_DIST = PACKAGERS bootstrap abuse.bmp abuse.png
 
+if HAVE_NONFREE
+else
+dist-hook:
+        @echo ""
+        @echo "          ===================================================="
+        @echo "            WARNING: This tarball will exclude non-free data"
+        @echo "          ===================================================="
+        @echo ""
+endif
+

abuse/trunk/configure.ac

@@ -28 +28 @@
 AC_ARG_ENABLE(release,
   [  --enable-release        build final release of the game (default no)])
+AC_ARG_ENABLE(nonfree,
+  [  --disable-nonfree       disable non-free data (default no)])
 
 dnl Checks for libraries
@@ -71 +73 @@
   REL="-g"
 fi
+
+dnl  Is our package stripped from its non-free data? Or did the user
+dnl  maybe disable non-free data?
+ac_cv_have_nonfree="no"
+if test -f "${srcdir}/data/sfx/ambcave1.wav"; then
+  ac_cv_have_nonfree="yes"
+fi
+if test "${enable_nonfree}" = "no"; then
+  ac_cv_have_nonfree="no"
+fi
+AM_CONDITIONAL(HAVE_NONFREE, test "${ac_cv_have_nonfree}" = "yes")
 
 # Optimizations

abuse/trunk/data/Makefile.am

@@ -18 +18 @@
           cd "$(DESTDIR)$(datafiledir)" && rm -f $$p; \
         done
-
-demos = \
-    levels/demo1.dat levels/mac/demo1.dat levels/mac/demo2.dat \
-    levels/mac/demo3.dat levels/mac/demo4.dat levels/mac/demo5.dat
-
-music = \
-    music/intro.hmi music/victory.hmi \
-    music/abuse00.hmi music/abuse01.hmi music/abuse02.hmi music/abuse03.hmi \
-    music/abuse04.hmi music/abuse06.hmi music/abuse08.hmi music/abuse09.hmi \
-    music/abuse11.hmi music/abuse13.hmi music/abuse15.hmi music/abuse17.hmi
 
 lisp = \
@@ -79 +69 @@
     addon/twist/lisp/userfuns.lsp addon/twist/lisp/weapons.lsp \
     addon/twist/twist.lsp
-
-extra = \
-    defaults.prp
 
 art = \
@@ -223 +210 @@
     addon/twist/levels/l01s03.lvl addon/twist/levels/l01s04.lvl
 
+demos = \
+    levels/demo1.dat levels/mac/demo1.dat levels/mac/demo2.dat \
+    levels/mac/demo3.dat levels/mac/demo4.dat levels/mac/demo5.dat
+
 doc = \
     addon/aliens/aliens.txt \
@@ -231 +222 @@
     addon/pong/pong.txt \
     addon/twist/readme.txt
+
+extra = \
+    defaults.prp
+
+if HAVE_NONFREE
+music = \
+    music/intro.hmi music/victory.hmi \
+    music/abuse00.hmi music/abuse01.hmi music/abuse02.hmi music/abuse03.hmi \
+    music/abuse04.hmi music/abuse06.hmi music/abuse08.hmi music/abuse09.hmi \
+    music/abuse11.hmi music/abuse13.hmi music/abuse15.hmi music/abuse17.hmi
 
 sound = \
@@ -283 +284 @@
     \
     addon/twist/sfx/dray.wav
-
+else
+music =
+sound =
+endif
+