Changeset 418e63392808bfccb92b805ece3f6b9374538bd0

Timestamp:

08/18/05 17:38:09 (3 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1124379489 +0000

git-parent:

[239aa0bf6db920800e18f8f8618d6670ac697598]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1124379489 +0000

Message:

- Use a common rule to build plugins (refs #297)

(tested on Mingw32 and native Linux, might need some tweaks)

- Remove some legacy code

Files:

• bootstrap (modified) (7 diffs)
• modules/gui/wince/Modules.am (modified) (1 diff)

bootstrap

@@ -217 +217 @@
-BUILT_SOURCES =
-SUBDIRS = ${subdirs}
+SUFFIXES = _plugin\$(LIBEXT) _plugin.a
-
-libvlcdir = \$(libdir)/vlc/\$(basedir)
@@ -234 +235 @@
-
-all: all-modules
+
+# Find out which modules were enabled and tell make to build them
-all-modules:
-    @set fnord \$\$MAKEFLAGS; amf=\$\$2; targets=\`\\
@@ -241 +244 @@
-    \`; case "\$\$targets" in *lib*) \$(MAKE) \$(AM_MAKEFLAGS) \$\$targets || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; ;; esac; \\
-    test -z "\$\$fail"
+
+# Build a plugin with the adequate linker and linker's flags
+_plugin.a_plugin\$(LIBEXT):
+    @mod="\$*" ; mod=\$\${mod:3} ; \
+    ldfl="\`\$(VLC_CONFIG) --libs plugin \$\$mod\` -u vlc_entry__0_8_2" ; \
+    case \`\$(VLC_CONFIG) --linkage \$\$mod\` in \\
+      c++)  ld="\$(CXXLINK)" ;; \
+      objc) ld="\$(OBJCLINK)" ;; \
+      c|*)  ld="\$(LINK)" ;; \
+    esac ; \
+    echo \$\$ld \$< \$\$ldfl ; \
+    \$\$ld \$< \$\$ldfl
-
-\$(srcdir)/Makefile.am: \$(srcdir)/Modules.am \$(top_srcdir)/bootstrap
@@ -316 +331 @@
-  for mod in $mods
-  do
-    if grep '^SOURCES_'${mod}'.*=.*PRIVATE' < "${modf}" >/dev/null 2>&1; then
-        PRIVATE='#'; else
-        PRIVATE=''; fi
-    if grep '^nodist_SOURCES_'${mod}'' < "${modf}" >/dev/null 2>&1; then
-        NODIST=''; else
@@ -344 +356 @@
-    fi
-    if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
-${PRIVATE}
+
-EOF
-    fi
-    cat >> "${makf}" << EOF
-${PRIVATE}
+
-EOF
-    if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
-${PRIVATE}
+
-EOF
-    fi
@@ -359 +371 @@
-lib${mod}_plugin_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags plugin ${mod}\`
-
-${PRIVATE}
+
-EOF
-    if [ "${NODIST}" != "#" ]; then cat >> "${makf}" << EOF
-${PRIVATE}
+
-EOF
-    fi
@@ -380 +392 @@
-lib${mod}_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin ${mod}\`
-lib${mod}_a_OBJCFLAGS = \`\$(VLC_CONFIG) --objcflags builtin ${mod}\`
-
-lib${mod}dir = \$(libdir)/vlc/${topdir}
-${PRIVATE}lib${mod}_plugin\$(LIBEXT): \$(lib${mod}_plugin_a_OBJECTS)
-${PRIVATE}  @case \`\$(VLC_CONFIG) --linkage ${mod}\` in \\
-${PRIVATE}    c++) echo \$(CXXLINK) \$(lib${mod}_plugin_a_OBJECTS) \\\`\$(VLC_CONFIG) --libs plugin ${mod}\\\` ; \$(CXXLINK) \$(lib${mod}_plugin_a_OBJECTS) \`\$(VLC_CONFIG) --libs plugin ${mod}\` ;; \\
-${PRIVATE}    objc) echo \$(OBJCLINK) \$(lib${mod}_plugin_a_OBJECTS) \\\`\$(VLC_CONFIG) --libs plugin ${mod}\\\` ; \$(OBJCLINK) \$(lib${mod}_plugin_a_OBJECTS) \`\$(VLC_CONFIG) --libs plugin ${mod}\` ;; \\
-${PRIVATE}    c|*) echo \$(LINK) \$(lib${mod}_plugin_a_OBJECTS) \\\`\$(VLC_CONFIG) --libs plugin ${mod}\\\` ; \$(LINK) \$(lib${mod}_plugin_a_OBJECTS) \`\$(VLC_CONFIG) --libs plugin ${mod}\` ;; \\
-${PRIVATE}  esac
-
-
-EOF

modules/gui/wince/Modules.am

@@ -1 @@
-
++
-.rc.o:
-    $(WINDRES) -DUNDER_CE -D__MINGW32__ -I. -I$(srcdir) -i $< -o $@