[svn-commits] seanbright: branch seanbright/editline-update r279885 - /team/seanbright/edit...

[SVN commits to the Digium repositories]

Author: seanbright
Date: Tue Jul 27 13:07:55 2010
New Revision: 279885

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=279885
Log:
Use the correct target name in main/Makefile

Modified:
    team/seanbright/editline-update/main/Makefile

Modified: team/seanbright/editline-update/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/seanbright/editline-update/main/Makefile?view=diff&rev=279885&r1=279884&r2=279885
==============================================================================
--- team/seanbright/editline-update/main/Makefile (original)
+++ team/seanbright/editline-update/main/Makefile Tue Jul 27 13:07:55 2010
@@ -105,7 +105,7 @@
 
 editline/libedit.a: CHECK_SUBDIR
 	cd editline && CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=) $(ASTCFLAGS))" LDFLAGS="$(_ASTLDFLAGS) $(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-	$(MAKE) -C editline libedit.a
+	$(MAKE) -C editline lib_a
 
 db1-ast/libdb1.a: CHECK_SUBDIR
 	_ASTCFLAGS="$(_ASTCFLAGS) -Wno-strict-aliasing" ASTCFLAGS="$(ASTCFLAGS)" $(MAKE) -C db1-ast libdb1.a
@@ -179,7 +179,7 @@
 
 $(MAIN_TGT): $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
 	@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
-	$(ECHO_PREFIX) echo "   [LD] $(OBJS) editline/src/.libs/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) $(LIBEDIT_EXTRA_LIB) -> $@"
+	$(ECHO_PREFIX) echo "   [LD] $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) $(LIBEDIT_EXTRA_LIB) -> $@"
 ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
 	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB) $(LIBEDIT_EXTRA_LIB)
 else