Changeset 8bbbcc31b7479f7ba33db7889b730cbb892e2744

Timestamp:

07/17/03 14:06:10 (5 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

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

git-parent:

[e30fd2a9aff6319968af1c471c567a2dc9660665]

git-author:

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

Message:

• mozilla/Makefile.am: Moved mozilla plugin generation directives here.
  
• configure.ac: Propagate $(top_srcdir) to the vlc-config call.
  

Files:

• Makefile.am (modified) (2 diffs)
• configure.ac (modified) (3 diffs)
• mozilla/.cvsignore (modified) (1 diff)
• mozilla/Makefile.am (added)
• vlc-config.in.in (modified) (4 diffs)

Makefile.am

@@ -8 +8 @@
-# something. DIST_SUBDIRS stores the directories where nothing is built but
-# which have makefiles with distribution information.
-
+mozilla 
-DIST_SUBDIRS = $(SUBDIRS) src debian doc ipkg lib autotools
-
@@ -567 +567 @@
-
-###############################################################################
-# Building the Mozilla plugin
-###############################################################################
-
-noinst_LIBRARIES = $(noinst_LIBRARIES_mozilla)
-
-MOSTLYCLEANFILES = $(LIBRARIES_mozilla)
-
-EXTRA_DIST += $(SOURCES_mozilla) mozilla/vlcintf.idl
-
-BUILT_SOURCES += $(BUILT_SOURCES_mozilla)
-
-SOURCES_mozilla = \
-    mozilla/vlcshell.cpp \
-    mozilla/vlcplugin.cpp \
-    mozilla/vlcplugin.h \
-    mozilla/vlcpeer.cpp \
-    mozilla/vlcpeer.h \
-    mozilla/support/classinfo.h \
-    $(SOURCES_mozilla_win32) \
-    $(SOURCES_mozilla_macosx) \
-    $(SOURCES_mozilla_unix) \
-    $(NULL)
-
-# Under Win32, Mozilla plugins need to be named NP******.DLL, but under Unix
-# the common naming scheme is lib******plugin.so. Also, we need npwin.cpp
-# under Win32 and npunix.c under Unix.
-if HAVE_WIN32
-LIBRARIES_mozilla = mozilla/npvlc$(LIBEXT)
-SOURCES_mozilla_win32 = mozilla/support/npwin.cpp
-CPPFLAGS_mozilla_EXTRA = -DXP_WIN -DXP_WIN32
-else
-if HAVE_DARWIN
-# We don't define LIBRARIES_mozilla because we'll be using project builder
-SOURCES_mozilla_macosx = mozilla/support/npmac.cpp
-else
-LIBRARIES_mozilla = mozilla/libvlcplugin$(LIBEXT)
-SOURCES_mozilla_unix = mozilla/support/npunix.c
-endif
-endif
-
-if BUILD_MOZILLA
-if UNTRUE
-noinst_LIBRARIES_mozilla = mozilla/libplugin.a
-endif
-
-mozilla_libplugin_a_SOURCES = $(SOURCES_mozilla)
-mozilla_libplugin_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla pic` \
-                             $(CPPFLAGS_mozilla_EXTRA) -Imozilla
-mozilla_libplugin_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla pic` \
-                               $(CPPFLAGS_mozilla_EXTRA) -Imozilla
-mozilla_libplugin_a_DEPENDENCIES = lib/libvlc_pic.a $(DATA_npvlc_rc)
-
-BUILT_SOURCES_mozilla = mozilla/vlcintf.h
-$(SOURCES_mozilla): mozilla/vlcintf.h
-
-mozilla_plugin_DATA = $(LIBRARIES_mozilla)
-mozilla_plugindir = $(libdir)/mozilla/plugins
-$(LIBRARIES_mozilla): $(mozilla_libplugin_a_OBJECTS) \
-                      $(mozilla_libplugin_a_DEPENDENCIES) stamp-pic
-    $(CXXLINK) $(mozilla_libplugin_a_OBJECTS) $(DATA_npvlc_rc) \
-      lib/libvlc_pic.a -shared \
-      `$(VLC_CONFIG) --libs vlc mozilla builtin pic`
-
-mozilla_vlcintf_xpt_DATA = mozilla/vlcintf.xpt
-mozilla_vlcintf_xptdir = $(libdir)/mozilla/components
-mozilla/vlcintf.xpt: mozilla/vlcintf.idl
-    $(XPIDL) -I/usr/share/idl/mozilla -I/usr/lib/mozilla/include/idl \
-      -m typelib -o mozilla/vlcintf $(srcdir)/mozilla/vlcintf.idl
-
-mozilla/vlcintf.h: mozilla/vlcintf.idl
-    $(XPIDL) -I/usr/share/idl/mozilla -I/usr/lib/mozilla/include/idl \
-      -m header -o mozilla/vlcintf $(srcdir)/mozilla/vlcintf.idl
-
-if HAVE_WIN32
-DATA_npvlc_rc = $(noinst_mozilla_npvlc_rc_DATA)
-noinst_mozilla_npvlc_rc_DATA = mozilla/npvlc_rc.$(OBJEXT)
-noinst_mozilla_npvlc_rcdir = $(libdir)
-mozilla/npvlc_rc.$(OBJEXT): mozilla/npvlc_rc.rc
-    $(WINDRES) --include-dir $(srcdir)/mozilla -i $< -o $@
-endif
-endif
-
-###############################################################################
-# Stamp rules
-###############################################################################

configure.ac

@@ -1 +1 @@
-dnl Autoconf settings for vlc
-1 2003/07/16 16:06:56
+2 2003/07/17 12:06:10
-
-AC_INIT(vlc,0.6.0)
@@ -3194 +3194 @@
-dnl  Handle substvars that use $(top_srcdir)
-dnl
-
+top_srcdir=\"\$(top_srcdir)\" 
-AC_SUBST(VLC_CONFIG)
-CPPFLAGS_save="${CPPFLAGS_save} -I\$(top_srcdir)/include"
@@ -3240 +3240 @@
-  lib/Makefile
-  modules/Makefile
+  mozilla/Makefile
-  m4/Makefile
-  po/Makefile.in

mozilla/.cvsignore

@@ +1 @@
+.deps
+.dirstamp
+*.lo
+*.la
-*.dll
+*.dylib
+*.sl
+*.so
+Makefile.in
+Makefile
-vlcintf.h
-vlcintf.xpt
-.deps
-.dirstamp

vlc-config.in.in

@@ -78 +78 @@
-#  automatically added when using $(COMPILE), $(CXXCOMPILE) or $(OBJCCOMPILE)
-#
-/usr/include 
+"/usr/include"
-  includes="-I@includedir@"
+fi
+if test "${top_srcdir}" != ""; then
+  top_srcdir="${top_srcdir}/"
-fi
-cppflags="${includes}"
@@ -244 +247 @@
-      register_targets "${module}"
-    done
-
+${top_srcdir}
-    printf '\n'
-  fi
@@ -252 +255 @@
-    done
-    if test "${echo_pic}" = yes; then
-
+${top_srcdir}
-    else
-
+${top_srcdir}
-    fi
-    printf '\n'
@@ -286 +289 @@
-    done
-    if test "${echo_pic}" = yes; then
-
+${top_srcdir}
-    else
-
+${top_srcdir}
-    fi
-  fi