changeset 1765:1b521a30820b

update base makefiles to Mk2.
author William Pitcock <nenolod@atheme.org>
date Mon, 24 Sep 2007 10:49:57 -0500
parents 0b6e61f2f22b
children c3fdb0e5a306
files Makefile src/Makefile
diffstat 2 files changed, 3 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Mon Sep 24 10:46:17 2007 -0500
+++ b/Makefile	Mon Sep 24 10:49:57 2007 -0500
@@ -1,19 +1,3 @@
-.SILENT:
-
-include mk/rules.mk
-include mk/init.mk
+include buildsys.mk
 
 SUBDIRS = src po
-
-include mk/objective.mk
-
-install-posthook:
-	@if test `whoami` = 'root' && test -z "$(DESTDIR)"; then \
-		echo; \
-		echo "WARNING:"; \
-		echo "On some systems, it might be required that you run"; \
-		echo "ldconfig. However, this isn't done automatically"; \
-		echo "because some ldconfig versions might break the system"; \
-		echo "if it's called without any parameters."; \
-	fi
-
--- a/src/Makefile	Mon Sep 24 10:46:17 2007 -0500
+++ b/src/Makefile	Mon Sep 24 10:49:57 2007 -0500
@@ -1,5 +1,5 @@
-include ../mk/rules.mk
-include ../mk/init.mk
+include ../extra.mk
+include ../buildsys.mk
 
 SUBDIRS = $(INPUT_PLUGINS) \
 	$(OUTPUT_PLUGINS) \
@@ -8,5 +8,3 @@
 	$(GENERAL_PLUGINS) \
 	$(CONTAINER_PLUGINS) \
 	$(TRANSPORT_PLUGINS)
-
-include ../mk/objective.mk