[svn-commits] seanbright: editline/trunk r177 - in /editline/trunk: ./ Makefile.in

[SVN commits to the Digium repositories]

Author: seanbright
Date: Tue Jul 27 18:19:28 2010
New Revision: 177

URL: http://svnview.digium.com/svn/thirdparty?view=rev&rev=177
Log:
Merge r87466 and r87467 from asterisk trunk:

------------------------------------------------------------------------
r87467 | kpfleming | 2007-10-29 18:24:44 -0400 (Mon, 29 Oct 2007) | 2 lines

clean up assembler and preprocessor files if they are here too

------------------------------------------------------------------------
r87466 | kpfleming | 2007-10-29 18:21:52 -0400 (Mon, 29 Oct 2007) | 2 lines

ignore preprocessor and assembler files if they are present


Modified:
    editline/trunk/   (props changed)
    editline/trunk/Makefile.in

Propchange: editline/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jul 27 18:19:28 2010
@@ -1,6 +1,8 @@
 Makefile
+*.i
 *.o_a
 *.o_s
+*.s
 common.h
 config.h
 config.log

Modified: editline/trunk/Makefile.in
URL: http://svnview.digium.com/svn/thirdparty/editline/trunk/Makefile.in?view=diff&rev=177&r1=176&r2=177
==============================================================================
--- editline/trunk/Makefile.in (original)
+++ editline/trunk/Makefile.in Tue Jul 27 18:19:28 2010
@@ -165,6 +165,7 @@
 	rm -f $(BGCSRCS:.c=.o_a) $(CCSRCS:.c=.o_a)
 	rm -f $(BGCSRCS:.c=.o_s) $(CCSRCS:.c=.o_s)
 	rm -f $(TCSRCS:.c=.o) $(TEST)
+	rm -f *.s *.i
 
 distclean : clean
 	rm -f config.log config.status config.cache config.h makelist Makefile