Changeset 2b0b78882c9015f35a69b70dfdb9f04597002182

Timestamp:

10/04/02 15:13:54 (6 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 1033737234 +0000

git-parent:

[80b15699ead10f9b1aa4687cd22c1bdcc866eb6d]

git-author:

Sam Hocevar <sam@videolan.org> 1033737234 +0000

Message:

• ./bootstrap: we use the proper linker for plugin compilation.
  
• ./modules/misc/testsuite/*: moved the null module into three test modules
  that are only built when --enable-testsuite is activated. This directory
  can be a good place for compilation tests or performance benchmarks.
  

Files:

• bootstrap (modified) (4 diffs)
• configure.ac.in (modified) (4 diffs)
• modules/Makefile.am (modified) (1 diff)
• modules/misc/Modules.am (modified) (1 diff)
• modules/misc/gtk_main.c (modified) (3 diffs)
• modules/misc/network/ipv6.c (modified) (2 diffs)
• modules/misc/null.c (deleted)
• modules/misc/testsuite/.cvsignore (added)
• modules/misc/testsuite/Modules.am (added)
• modules/misc/testsuite/test1.c (added)
• modules/misc/testsuite/test2.cpp (added)
• modules/misc/testsuite/test3.m (added)

bootstrap

@@ -2 +2 @@
-
-##  bootstrap file for vlc, the VideoLAN Client
-7 2002/10/03 08:44:11
+8 2002/10/04 13:13:54
-##
-##  Authors: Samuel Hocevar <sam@zoy.org>
@@ -74 +74 @@
-  sed -n -e 's/^ *SOURCES_\([^ ]*\).*/\1/p' < ${mf} | while read mod
-  do
+    LINKER="LINK"
-    if echo "$ALL_FLAGS" | grep '^CPPFLAGS_'${mod}'=$' >/dev/null 2>&1; then
-        echo "AC_SUBST(CPPFLAGS_${mod})" >> configure.ac; fi
@@ -79 +80 @@
-        echo "AC_SUBST(CFLAGS_${mod})" >> configure.ac; fi
-    if echo "$ALL_FLAGS" | grep '^CXXFLAGS_'${mod}'=$' >/dev/null 2>&1; then
+        LINKER="CXXLINK"
-        echo "AC_SUBST(CXXFLAGS_${mod})" >> configure.ac; fi
-    if echo "$ALL_FLAGS" | grep '^OBJCFLAGS_'${mod}'=$' >/dev/null 2>&1; then
+        LINKER="OBJCLINK"
-        echo "AC_SUBST(OBJCFLAGS_${mod})" >> configure.ac; fi
-    if echo "$ALL_FLAGS" | grep '^LDFLAGS_'${mod}'=$' >/dev/null 2>&1; then
@@ -151 +154 @@
-${PRIVATE}noinst_LIBRARIES += \$(L_${mod}_p)
-${PRIVATE}${dir}/lib${mod}_plugin\$(LIBEXT): \$(${sym}_lib${mod}_plugin_a_OBJECTS)
-CC) \$^ -o \$@ -shared \$(LDFLAGS)
+${LINKER}) \$^ -o \$@ -shared
-
-

configure.ac.in

@@ -508 +508 @@
-dnl  default modules
-dnl
-
-
+
-PLUGINS="${PLUGINS} es audio mpeg_system ps ts"
-PLUGINS="${PLUGINS} idct idctclassic motion mpeg_video spudec mpeg_audio"
@@ -2093 +2092 @@
-
-dnl
+dnl  test plugins
+dnl
+AC_ARG_ENABLE(testsuite,
+  [  --enable-testsuite      build test modules (default disabled)])
+if test "x${enable_testsuite}" = "xyes"
+then
+  TESTS="test1 test2 test3"
+  dnl  we define those so that bootstrap sets the right linker
+  CXXFLAGS_test2="${CXXFLAGS_test2}"
+  OBJCFLAGS_test3="${OBJCFLAGS_test3}"
+  dnl  this one is needed until automake knows what to do
+  LDFLAGS_test3="${LDFLAGS_test3} -lobjc"
+  PLUGINS="${PLUGINS} ${TESTS}"
+  BUILTINS="${BUILTINS} ${TESTS}"
+fi
+
+dnl
-dnl  gtk_main plugin
-dnl
@@ -2098 +2114 @@
-then
-    PLUGINS="${PLUGINS} gtk_main"
- = 
+=
-    CFLAGS_gtk_main="${CFLAGS_gtk_main} ${CFLAGS_gtk} ${CFLAGS_familiar}"
-    LDFLAGS_gtk_main="${LDFLAGS_gtk_main} ${LDFLAGS_gtk} ${LDFLAGS_familiar}"
@@ -2124 +2140 @@
-   fi])
-
-
-
+
+
+
-if test "x${ac_cv_header_dlfcn_h}" = "xno" -a "x${ac_cv_header_image_h}" = "xno" -a "x${SYS}" != "xmingw32"
-then

modules/Makefile.am

@@ -50 +50 @@
-    misc/memcpy/Modules.am \
-    misc/network/Modules.am \
+    misc/testsuite/Modules.am \
-    video_chroma/Modules.am \
-    video_filter/Modules.am \

modules/misc/Modules.am

@@ -1 @@
-SOURCES_null = modules/misc/null.c
-SOURCES_gtk_main = modules/misc/gtk_main.c
-SOURCES_gnome_main = modules/misc/gtk_main.c

modules/misc/gtk_main.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-7 2002/10/03 13:21:55
+8 2002/10/04 13:13:54
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -140 +140 @@
-}
-
-
-
-
-
+
-
-/*****************************************************************************
@@ -175 +172 @@
-    vlc_thread_ready( p_this );
-
-
+
+
-    gtk_timeout_add( INTF_IDLE_SLEEP / 1000, foo, p_this );
-

modules/misc/network/ipv6.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-2 2002/08/08 00:35:11
+3 2002/10/04 13:13:54
- *
- * Authors: Alexis Guillard <alexis.guillard@bt.com>
@@ -147 +147 @@
-#endif
-#if 0
-\n
+
-#endif
-        }