Changeset fb005c12802a3646a2cffe01880b7382366e1f2c

Timestamp:

01/30/07 13:52:47 (2 years ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1170161567 +0000

git-parent:

[6b89b49e2eb8898ecf5a7dd8491a1f620c919f94]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1170161567 +0000

Message:

Extend contrib buildsystem to allow for a finer control on system and Linux distributions rules. The bootstrap tries to guess the operating system to build for by looking at the compiler prefix. For native building (usually Linux/Unix-like systems) additional matching logic should be written. Currently only Fedora-Core systems are detected as being different from the normal Unix-rules.

Extend this logic to make a distinction for your system if it deviates from the standard Unix-like system that our contrib recognizes atm.

Files:

• extras/contrib/README (modified) (1 diff)
• extras/contrib/bootstrap (modified) (6 diffs)
• extras/contrib/src/Distributions/beos.mak (added)
• extras/contrib/src/Distributions/darwin.mak (added)
• extras/contrib/src/Distributions/debian.mak (added)
• extras/contrib/src/Distributions/fedora.mak (added)
• extras/contrib/src/Distributions/unix.mak (added)
• extras/contrib/src/Distributions/win32.mak (added)
• extras/contrib/src/Distributions/wince.mak (added)
• extras/contrib/src/Makefile (modified) (1 diff)

extras/contrib/README

@@ -10 +10 @@
-This will look for a i586-pc-beos-gcc cross compiler. Default is to
-build natively.
+
+Bootstrap generates your default contrib configuration and puts it in a file
+named 'distro.mak'. Edit this file to fine-tune your preferences for 3rd-party
+libraries that will be build in the contrib system.
-
-Customize config.mak if you need to, then you need to choose between

extras/contrib/bootstrap

@@ -49 +49 @@
-} > config.mak
-
+rm -f distro.mak
+{
+    echo "# Automatically generated by bootstrap"
+    echo "# Make changes if you know what you're doing."
+} > distro.mak
+
-if test "$HOST" != "$BUILD"; then
-    CC="${HOST}-gcc"
@@ -78 +84 @@
-        EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
-        echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
+        cat src/Distributions/darwin.mak >> distro.mak
-        ;;
-    i686-apple-darwin8)
@@ -89 +96 @@
-        EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
-        echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
+        cat src/Distributions/darwin.mak >> distro.mak
-        ;;
-    i586-pc-beos)
@@ -113 +121 @@
-                echo "PATH = ${PATH}" >> config.mak
-            fi
+            cat src/Distributions/beos.mak >> distro.mak
-        ;;
-    *mingw32*)
-            echo "HAVE_WIN32 = 1" >> config.mak
-            echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
+            cat src/Distributions/win32.mak >> distro.mak
-        ;;
-    i686-pc-cygwin)
@@ -127 +137 @@
-            EXTRA_LDFLAGS=" -mno-cygwin"
-            echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
+            cat src/Distributions/win32.mak >> distro.mak
-        ;;
-    arm-wince-pe)
@@ -132 +143 @@
-            echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
-            EXTRA_CPPFLAGS=" -D_WIN32_WCE"
+            cat src/Distributions/wince.mak >> distro.mak
-        ;;
-    *)
+            if test "$HOST" = "$BUILD"; then
+                echo "PKG_CONFIG_LIBDIR = /usr/lib/pkgconfig" >> config.mak
+            fi
+            # Try to match distribution
+            if test -f /etc/fedora-release; then
+                cat src/Distributions/fedora.mak >> distro.mak
+            else
+                # Default Unix-like systems
+                cat src/Distributions/unix.mak >> distro.mak
+            fi
-        ;;
-esac

extras/contrib/src/Makefile

@@ -146 +146 @@
-# Standard rules
-# ***************************************************************************
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-FORCE: