Revert changes to melt in previous commit.

Signed-off-by: Dan Dennedy <dan@dennedy.org>

diff --git a/src/melt/Makefile b/src/melt/Makefile
index 3e9dc719f085c9edcaf695528b5cbce01e10fd57..239bb393a298046afad2372017514f168173dd6c 100644 (file)
--- a/src/melt/Makefile
+++ b/src/melt/Makefile
@@ -1,6 +1,6 @@
 include ../../config.mak
 
-TARGET = mlt-process
+TARGET = melt
 
 OBJS = melt.o \
           io.o
@@ -15,7 +15,6 @@ all: $(TARGET)
 
 $(TARGET): $(OBJS)
                $(CC) -o $@ $(OBJS) $(LDFLAGS)
-               ln -sf $@ melt
 
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
@@ -32,7 +31,6 @@ install:      all
 
 uninstall:
        rm -f "$(DESTDIR)$(bindir)/$(TARGET)"
-       rm -f "$(DESTDIR)$(bindir)/melt"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/melt/melt.c b/src/melt/melt.c
index f72560959b323ce9d302fbaf989053fe873f0796..acb93a78600e4670e0368190c8924b3054cacc24 100644 (file)
--- a/src/melt/melt.c
+++ b/src/melt/melt.c
@@ -404,7 +404,7 @@ query_all:
                }
                else if ( !strcmp( argv[ i ], "-version" ) || !strcmp( argv[ i ], "--version" ) )
                {
-                       fprintf( stderr, "MLT mlt-process " VERSION "\n"
+                       fprintf( stderr, "MLT melt " VERSION "\n"
                                "Copyright (C) 2002-2009 Ushodaya Enterprises Limited\n"
                                "<http://www.mltframework.org/>\n"
                                "This is free software; see the source for copying conditions.  There is NO\n"
@@ -517,7 +517,7 @@ query_all:
        else
        {
                fprintf( stderr,
-"Usage: mlt-process [options] [producer [name=value]* ]+\n"
+"Usage: melt [options] [producer [name=value]* ]+\n"
 "Options:\n"
 "  -attach filter[:arg] [name=value]*       Attach a filter to the output\n"
 "  -attach-cut filter[:arg] [name=value]*   Attach a filter to a cut\n"