changeset 1209:e67fad649f58 trunk

[svn] - make it prettier
author nenolod
date Wed, 14 Jun 2006 00:16:06 -0700
parents 8014500e2c37
children 2419d0da1725
files ChangeLog Makefile mk/objective.mk
diffstat 3 files changed, 17 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Jun 14 00:14:13 2006 -0700
+++ b/ChangeLog	Wed Jun 14 00:16:06 2006 -0700
@@ -1,3 +1,12 @@
+2006-06-14 07:14:13 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [1330]
+  - shut a make error up by using sinclude instead of normal include when rules.mk doesn't exist yet
+  
+
+  Changes:        Modified:
+  +1 -1           trunk/Makefile  
+
+
 2006-06-14 07:07:04 +0000  William Pitcock <nenolod@nenolod.net>
   revision [1328]
   - if mk/rules.mk is missing, run configure to generate it (hopefully you are running the posix target, otherwise I feel sorry for you)
--- a/Makefile	Wed Jun 14 00:14:13 2006 -0700
+++ b/Makefile	Wed Jun 14 00:16:06 2006 -0700
@@ -5,11 +5,6 @@
 
 SUBDIRS = Plugins libaudacious intl $(SUBDIR_GUESS) audacious audtool po icons skin
 
-mk/rules.mk:
-	@echo "[building rules.mk for posix target, run configure manually if you do not want this]"
-	@sh configure
-	@echo "[complete]"
-
 install-posthook:
 	@if test `whoami` = 'root' && test -z "$(DESTDIR)"; then \
 		echo "[running ldconfig to update system library cache]"; \
--- a/mk/objective.mk	Wed Jun 14 00:14:13 2006 -0700
+++ b/mk/objective.mk	Wed Jun 14 00:16:06 2006 -0700
@@ -232,3 +232,11 @@
 
 # compatibility with automake follows
 am--refresh:
+
+mk/rules.mk:
+	@if [ -f "configure" ]; then \
+		echo "[building rules.mk for posix target, run configure manually if you do not want this]"; \
+		sh configure; \
+		echo "[complete]"; \
+	fi
+