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

[diego]

Author: diego
Date: Sat Feb  2 14:12:25 2008
New Revision: 560

Log:
Make install/uninstall targets non-recursive.


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

Modified: src/trunk/Makefile
==============================================================================
--- src/trunk/Makefile	(original)
+++ src/trunk/Makefile	Sat Feb  2 14:12:25 2008
@@ -9,10 +9,17 @@ nututils: libnut
 	$(MAKE) -C nututils
 
 install:
-	$(MAKE) -C libnut install
+	install -d $(prefix)/lib
+	install -m 644 libnut/libnut.a $(prefix)/lib
+	install -d $(prefix)/include
+	install -m 644 libnut/libnut.h $(prefix)/include
+
+uninstall:
+	rm -f $(prefix)/lib/libnut.a
+	rm -f $(prefix)/include/libnut.h
 
 clean distclean:
 	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
+.PHONY: all libnut nututils install uninstall clean distclean

Modified: src/trunk/libnut/Makefile
==============================================================================
--- src/trunk/libnut/Makefile	(original)
+++ src/trunk/libnut/Makefile	Sat Feb  2 14:12:25 2008
@@ -4,16 +4,6 @@ OBJS = muxer.o demuxer.o reorder.o frame
 
 all: libnut.a
 
-install:
-	install -d $(prefix)/lib
-	install -m 644 libnut.a $(prefix)/lib
-	install -d $(prefix)/include
-	install -m 644 libnut.h $(prefix)/include
-
-uninstall:
-	rm -f $(prefix)/lib/libnut.a
-	rm -f $(prefix)/include/libnut.h
-
 libnut.a: $(OBJS)
 	rm -f $@
 	$(AR) rc $@ $^
@@ -24,4 +14,4 @@ libnut.so: $(OBJS)
 
 *.o: priv.h libnut.h
 
-.PHONY: all install uninstall
+.PHONY: all