Changeset e2d69c725e4f1f869a60288364f42b14cb7c3fe0

Timestamp:

01/07/03 18:25:24 (5 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

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

git-parent:

[c0ec41c709da782bbe8d6b7032887768002f3672]

git-author:

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

Message:

• bootstrap:
  + Removed the Modules.am generation. To build module/foo/libfoo.so, you
  

now need to cd modules/foo and make libfoo.so.

+ Workaround for Solaris sed. Which sucks. Did I mention that before?

Files:

• .cvsignore (modified) (1 diff)
• Makefile.am (modified) (5 diffs)
• bootstrap (modified) (9 diffs)

.cvsignore

@@ -18 +18 @@
-Makefile.in
-Makefile
-Modules.am
-build-stamp
-configure-stamp

Makefile.am

@@ -15 +15 @@
-    INSTALL.win32 \
-    MAINTAINERS \
-    Modules.am \
-    README.MacOSX.rtf \
-    bootstrap \
@@ -372 +371 @@
-install-exec-local:
-    for i in "" `$(VLC_CONFIG) --target plugin` ; do if test -n "$$i" ; then \
-$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f2
+modules/$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f1
-    fi ; done
-    for i in "" `$(VLC_CONFIG) --target builtin` `$(VLC_CONFIG) --target builtin pic` ; do if test -n "$$i" ; then \
-
+modules/
-    fi ; done
-    for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
@@ -394 +393 @@
-    $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/modules
-    for i in "" `$(VLC_CONFIG) --target plugin` ; do \
-
+modules/
-        "$(srcdir)/VLC.app/Contents/MacOS/modules" ; \
-      fi ; done
@@ -449 +448 @@
-    for i in "" `$(VLC_CONFIG) --target plugin` ; do \
-      if test -n "$$i" ; then \
-
+modules/
-      fi ; done
-
@@ -625 +624 @@
-
-###############################################################################
-# Modules
-###############################################################################
-include Modules.am
-
-###############################################################################
-# Force rule
-###############################################################################

bootstrap

@@ -2 +2 @@
-
-##  bootstrap file for the VLC media player
-5 2003/07/01 14:25:47
+6 2003/07/01 16:25:24
-##
-##  Authors: Sam Hocevar <sam@zoy.org>
@@ -37 +37 @@
-printf "generating modules/**/Makefile.am and m4/private.m4"
-
-
-
+
-rm -f m4/private.m4 && cat > m4/private.m4 << EOF
-dnl  Private VLC macros - generated by bootstrap
@@ -73 +72 @@
-EOF
-
-\(modules/
+modules/\(
-do
-  printf "."
-
-2
+modules/
+1
-  # automake will not recurse for make dist if we don't define SUBDIRS = .
-
+modules/
-  #parent=`echo ${dir} | sed -e 's@[^/]*@..@g'`
-
-${dir}/Makefile.am && cat > 
+modules/
+modules/${dir}/Makefile.am && cat > modules/
-
-# Autogenerated by bootstrap - DO NOT EDIT - edit Modules.am instead
@@ -110 +109 @@
-#dnl  AM_CONDITIONAL(${mod}_b, test x\$${mod}_b = xyes)
-#EOF
-    cat >> Modules.am << EOF
-${dir}/lib${mod}_plugin: ${dir}/lib${mod}_plugin\$(LIBEXT)
-${dir}/lib${mod}_plugin\$(LIBEXT): include/vlc_symbols.h FORCE
-    cd ${dir} && \$(MAKE) lib${mod}_plugin\$(LIBEXT)
-${dir}/lib${mod}.a: include/vlc_symbols.h FORCE
-    cd ${dir} && \$(MAKE) lib${mod}.a
-${dir}/lib${mod}_pic.a: include/vlc_symbols.h FORCE
-    cd ${dir} && \$(MAKE) lib${mod}_pic.a
-
-EOF
-    cat >> m4/private.m4-tmp4 << EOF
-    ${mod}) list="\\\${list} ${dir}/lib${mod}" ;;
@@ -130 +119 @@
-# - *_CFLAGS, *_CXXFLAGS etc. because per-object CPPFLAGS does not seem to
-#   work properly with any automake version I tested.
-
+modules/
-# The ${mod} plugin
-
@@ -148 +137 @@
-L${count}pic = lib${mod}_pic.a
-EOF
-
+modules/
-B${count}p = \$(nodist_SOURCES_${mod})
-B${count}b = \$(nodist_SOURCES_${mod})
-EOF
-    fi
-
+modules/
-endif
-
-EOF
-
+modules/
-${PRIVATE}BUILT_SOURCES += \$(B${count}p) \$(B${count}b)
-EOF
-    fi
-
+modules/
-${PRIVATE}lib${mod}_plugin_a_SOURCES = \$(SOURCES_${mod})
-EOF
-
+modules/
-${PRIVATE}nodist_lib${mod}_plugin_a_SOURCES = \$(nodist_SOURCES_${mod})
-EOF
-    fi
-
+modules/
-lib${mod}_plugin_a_CFLAGS = \`\$(VLC_CONFIG) --cflags plugin ${mod}\`
-lib${mod}_plugin_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags plugin ${mod}\`
@@ -175 +164 @@
-lib${mod}_pic_a_SOURCES = ${PRIVATE}\$(SOURCES_${mod})
-EOF
-
+modules/
-nodist_lib${mod}_pic_a_SOURCES = ${PRIVATE}\$(nodist_SOURCES_${mod})
-EOF
-    fi
-
+modules/
-lib${mod}_pic_a_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin pic ${mod}\`
-lib${mod}_pic_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin pic ${mod}\`
@@ -186 +175 @@
-lib${mod}_a_SOURCES = ${PRIVATE}\$(SOURCES_${mod})
-EOF
-
+modules/
-nodist_lib${mod}_a_SOURCES = ${PRIVATE}\$(nodist_SOURCES_${mod})
-EOF
-    fi
-
+modules/
-lib${mod}_a_CFLAGS = \`\$(VLC_CONFIG) --cflags builtin ${mod}\`
-lib${mod}_a_CXXFLAGS = \`\$(VLC_CONFIG) --cxxflags builtin ${mod}\`
@@ -239 +228 @@
-
-# remove autotools cruft
-
+ Modules.am
-# remove old autotools extra cruft
-rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh