Changeset 9a4101d72b5a6a57891656e5771eea0c0722f581

Timestamp:

02/25/08 18:32:54 (5 months ago)

Author:

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

git-committer:

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

git-parent:

[0d4b0871ad1d55655de7b89d15980152fe568178]

git-author:

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

Message:

More vlc to src/ (yes, I know this screws up things).
If you packaged without staged installation you're going to have a problem (but packaging without staged installation is to utterly lame in the first place)

Files:

• Makefile.am (modified) (2 diffs)
• src/Makefile.am (modified) (2 diffs)

Makefile.am

@@ -246 +246 @@
-# Don't complain if it doesn't work. -- Courmisch
-libvlc:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-#To get some nice output
-nice:
-    $(top_builddir)/compile
-
-core: libvlc vlc$(EXEEXT)
-
-.PHONY: core
-
-vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
-    @rm -f vlc$(EXEEXT)
-    @case `$(VLC_CONFIG) --linkage vlc builtin` in \
-      c++) cmd="$(CXXLINK)" ;; \
-      objc) cmd="$(OBJCLINK)" ;; \
-      c|*) cmd="$(LINK)" ;; \
-    esac ; \
-    cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)" ; \
-    echo $$cmd ; \
-    eval $$cmd
-
-if HAVE_BEOS
@@ -617 +582 @@
-endif
-
-if HAVE_WIN32
-DATA_win32_rc = $(noinst_share_vlc_win32_rc_DATA)
-noinst_share_vlc_win32_rc_DATA = share/vlc_win32_rc.$(OBJEXT)
-noinst_share_vlc_win32_rcdir = $(libdir)
-share/vlc_win32_rc.$(OBJEXT): share/vlc_win32_rc.rc
-    $(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(srcdir)/share -i $< -o $@
-endif
-
-
-###############################################################################
-# Building architecture-specific binary packages

src/Makefile.am

@@ -130 +130 @@
-    echo ";" >> "$@.tmp"
-    mv -f -- "$@.tmp" "$@"
+
-###############################################################################
-# Building libvlc
@@ -373 +374 @@
-    mv -f $@.tmp $@
-
+
+###############################################################################
+# Building vlc
+###############################################################################
+
+bin_PROGRAMS = vlc
+# 
+vlc_SOURCES = vlc.c
+vlc_DEPENDENCIES = $(DATA_win32_rc)
+
+vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
+vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc`
+vlc_LDADD = $(DATA_win32_rc) libvlc.la $(LTLIBINTL) `$(VLC_CONFIG) -libs vlc`
+
+vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
+    @rm -f vlc$(EXEEXT)
+    @case `$(VLC_CONFIG) --linkage vlc builtin` in \
+      c++) cmd="$(CXXLINK)" ;; \
+      objc) cmd="$(OBJCLINK)" ;; \
+      c|*) cmd="$(LINK)" ;; \
+    esac ; \
+    cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)" ; \
+    echo $$cmd ; \
+    eval $$cmd
+
+if HAVE_WIN32
+DATA_win32_rc = $(noinst_share_vlc_win32_rc_DATA)
+noinst_DATA = vlc_win32_rc.$(OBJEXT)
+
+vlc_win32_rc.$(OBJEXT): $(top_srcdir)/share/vlc_win32_rc.rc
+    $(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(srcdir)/share -i $< -o $@
+endif
+
-###############################################################################
-# Unit/regression test