[NUT-devel] [nut]: r559 - in src/trunk: Makefile libnut/Makefile nututils/Makefile

[diego]

Author: diego
Date: Sat Feb  2 14:08:54 2008
New Revision: 559

Log:
Make clean target non-recursive.


Modified:
   src/trunk/Makefile
   src/trunk/libnut/Makefile
   src/trunk/nututils/Makefile

Modified: src/trunk/Makefile
==============================================================================
--- src/trunk/Makefile	(original)
+++ src/trunk/Makefile	Sat Feb  2 14:08:54 2008
@@ -12,7 +12,7 @@ install:
 	$(MAKE) -C libnut install
 
 clean distclean:
-	$(MAKE) -C libnut clean
-	$(MAKE) -C nututils clean
+	rm -f libnut/*\~ libnut/*.o libnut/libnut.so libnut/libnut.a
+	rm -f nututils/*\~ nututils/*.o nututils/nutmerge nututils/nutindex nututils/nutparse
 
 .PHONY: all libnut nututils install distclean clean

Modified: src/trunk/libnut/Makefile
==============================================================================
--- src/trunk/libnut/Makefile	(original)
+++ src/trunk/libnut/Makefile	Sat Feb  2 14:08:54 2008
@@ -24,7 +24,4 @@ libnut.so: $(OBJS)
 
 *.o: priv.h libnut.h
 
-clean:
-	rm -f *\~ libnut.so libnut.a *.o
-
-.PHONY: all install uninstall clean
+.PHONY: all install uninstall

Modified: src/trunk/nututils/Makefile
==============================================================================
--- src/trunk/nututils/Makefile	(original)
+++ src/trunk/nututils/Makefile	Sat Feb  2 14:08:54 2008
@@ -6,7 +6,4 @@ all: nutmerge nutindex nutparse
 
 nutmerge: demux_avi.c demux_ogg.c framer_mp3.c framer_mpeg4.c framer_vorbis.c nutmerge.h ../libnut/libnut.a # demux_nut.c
 
-clean:
-	rm -f *\~ nutmerge nutindex nutparse *.o
-
-.PHONY: all clean
+.PHONY: all