Changeset 239aa0bf6db920800e18f8f8618d6670ac697598

Timestamp:

18/08/05 17:36:12 (3 years ago)

Author:

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

git-committer:

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

git-parent:

[703f2f5d2343e0642fb4a07d3578b386de8d3a2a]

git-author:

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

Message:

- (Un)install plugins from their directory (refs #297)
- Fix mostlyclean target

Files:

• Makefile.am (modified) (2 diffs)
• bootstrap (modified) (5 diffs)

Makefile.am

@@ -488 +488 @@
-endif
-
-modules and the 
+
-install-exec-local:
-    for i in "" `$(VLC_CONFIG) --target plugin` ; do if test -n "$$i" ; then \
-      echo $(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | sed -e 's,.*modules/\([^/]*\).*,\1,'`" ; \
-      $(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | sed -e 's,.*modules/\([^/]*\).*,\1,'`" ; \
-    fi ; done
-    for i in "" `$(VLC_CONFIG) --target builtin` ; do if test -n "$$i" ; then \
-      echo $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \
-      $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \
-    fi ; done
-if BUILD_MOZILLA
-    for i in "" `$(VLC_CONFIG) --target builtin pic` ; do if test -n "$$i" ; then \
-      echo $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \
-      $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \
-    fi ; done
-endif
-    for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
-      rm -f "$(DESTDIR)$(bindir)/$$i" && \
@@ -511 +497 @@
-# the opposite of install-{data,exec}-local
-uninstall-local:
-    @for i in "" `$(VLC_CONFIG) --target plugin` ; do if test -n "$$i" ; then \
-      echo rm -f "$(DESTDIR)$(libdir)/vlc/`echo $$i | sed -e 's,.*modules/\([^/]*\).*,\1,'`/$$(basename $$i$(LIBEXT))" ; \
-      rm -f "$(DESTDIR)$(libdir)/vlc/`echo $$i | sed -e 's,.*modules/\([^/]*\).*,\1,'`/$$(basename $$i$(LIBEXT))" ; \
-    fi ; done
-    @for i in "" `$(VLC_CONFIG) --target builtin` ; do if test -n "$$i" ; then \
-      echo rm -f "$(DESTDIR)$(libdir)/vlc/$$(basename $$i)" ; \
-      rm -f "$(DESTDIR)$(libdir)/vlc/$$(basename $$i)" ; \
-    fi ; done
-if BUILD_MOZILLA
-    @for i in "" `$(VLC_CONFIG) --target builtin pic` ; do if test -n "$$i" ; then \
-      echo rm -f "$$i" "$(DESTDIR)$(libdir)/vlc/$$(basename $$i)" ; \
-      rm -f "$$i" "$(DESTDIR)$(libdir)/vlc/$$(basename $$i)" ; \
-    fi ; done
-endif
-    for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
-      rm -f "$(DESTDIR)$(bindir)/$$i" ; \

bootstrap

@@ -185 +185 @@
-EXTRA_DIST = LIST
-SUBDIRS = `sed -ne 's,modules/\([^/]*\)/Makefile,\1,p' configure.ac | xargs`
-#DIST_SUBDIRS = \$(SUBDIRS)
-EOF
-
@@ -206 +205 @@
-
-# ${makf} automatically generated from ${modf} by bootstrap
-
+
+
+
+
-
-NULL =
@@ -215 +217 @@
-BUILT_SOURCES =
-SUBDIRS = ${subdirs}
-
-${basedir}
+
+\$(basedir)
-
-EXTRA_LIBRARIES = ${extra_libs}
@@ -231 +233 @@
-endif
-
-clean-local:
-    -rm -f *.a *.so *.dll *.sl *.dylib
-
-all: all-modules
-all-modules:
-    @set fnord \$\$MAKEFLAGS; amf=\$\$2; targets=\`\\
-$mods
-$mods
-$mods
+\$(mods)
+\$(mods)
+\$(mods)
-    \`; case "\$\$targets" in *lib*) \$(MAKE) \$(AM_MAKEFLAGS) \$\$targets || case "\$\$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; ;; esac; \\
-    test -z "\$\$fail"
@@ -245 +244 @@
-\$(srcdir)/Makefile.am: \$(srcdir)/Modules.am \$(top_srcdir)/bootstrap
-    cd \$(top_srcdir) && \$(SHELL) ./bootstrap
+
+mostlyclean-local:
+    -rm -f *.a *\$(LIBEXT)
+
+### automake creates libvlcdir after running install-*-local
+### so we have to create it ourselves first
+install-exec-local: all-modules
+    \$(mkdir_p) "\$(DESTDIR)\$(libvlcdir)"
+    @z=\$\$(\$(VLC_CONFIG) --list plugin); \
+    for mod in \$(mods); do \
+      case "\$\$z " \
+        in *\ \$\${mod}\ *) \
+          echo \$(INSTALL_PROGRAM) -m 755 "lib\$\${mod}_plugin\$(LIBEXT)" "\$(DESTDIR)\$(libvlcdir)/" ; \
+          \$(INSTALL_PROGRAM) -m 755 "lib\$\${mod}_plugin\$(LIBEXT)" "\$(DESTDIR)\$(libvlcdir)/" || exit \$\$?; \
+          ;; \
+      esac; \
+    done
+    @z=\$\$(\$(VLC_CONFIG) --list builtin); \
+    for mod in \$(mods); do \
+      case "\$\$z " \
+        in *\ \$\${mod}\ *) \
+          echo \$(INSTALL_DATA) -m 644 "lib\$\${mod}.a" "\$(DESTDIR)\$(libdir)/vlc/" ; \
+          \$(INSTALL_DATA) -m 644 "lib\$\${mod}.a" "\$(DESTDIR)\$(libvlcdir)/" || exit \$\$?; \
+          ;; \
+      esac; \
+    done
+if BUILD_MOZILLA
+    @z=\$\$(\$(VLC_CONFIG) --list builtin); \
+    for mod in \$(mods); do \
+      case "\$\$z " \
+        in *\ \$\${mod}\ *) \
+          echo \$(INSTALL_DATA) -m 644 "lib\$\${mod}_pic.a" "\$(DESTDIR)\$(libdir)/vlc/" ; \
+          \$(INSTALL_DATA) -m 644 "lib\$\${mod}_pic.a" "\$(DESTDIR)\$(libvlcdir)/" || exit \$\$?; \
+          ;; \
+      esac; \
+    done
+endif
+
+uninstall-local:
+    @z=\$\$(\$(VLC_CONFIG) --list plugin); \
+    for mod in \$(mods); do \
+      case "\$\$z " \
+        in *\ \$\${mod}\ *) \
+          echo rm -f "\$(DESTDIR)\$(libvlcdir)/lib\$\${mod}_plugin\$(LIBEXT)" ; \
+          rm -f "\$(DESTDIR)\$(libvlcdir)/lib\$\${mod}_plugin\$(LIBEXT)" || true; \
+          ;; \
+      esac; \
+    done
+    @z=\$\$(\$(VLC_CONFIG) --list builtin); \
+    for mod in \$(mods); do \
+      case "\$\$z " \
+        in *\ \$\${mod}\ *) \
+          echo rm -f "\$(DESTDIR)\$(libdir)/vlc/lib\$\${mod}.a" ; \
+          rm -f "\$(DESTDIR)\$(libdir)/vlc/lib\$\${mod}.a" || true; \
+          ;; \
+      esac; \
+    done
+if BUILD_MOZILLA
+    @z=\$\$(\$(VLC_CONFIG) --list builtin); \
+    for mod in \$(mods); do \
+      case "\$\$z " \
+        in *\ \$\${mod}\ *) \
+          echo rm -f "\$(DESTDIR)\$(libdir)/vlc/lib\$\${mod}_pic.a" ; \
+          rm -f "\$(DESTDIR)\$(libdir)/vlc/lib\$\${mod}_pic.a" || true; \
+          ;; \
+      esac; \
+    done
+endif
-
-EOF