changeset 563:0879e7ad85b1 trunk

[svn] some buildsystem changes... nothing notable yet
author nenolod
date Thu, 02 Feb 2006 14:15:36 -0800
parents 5cdadcf74ec3
children ca034eafe72f
files Makefile.am Makefile.in Plugins/Makefile.am Plugins/Makefile.in mk/objective.mk po/Makevars
diffstat 6 files changed, 32 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Thu Feb 02 13:57:20 2006 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-ACLOCAL_AMFLAGS = -I m4
-
-SUBDIRS = intl libaudacious audacious Plugins po icons skin
-
-man_MANS = audacious.1
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = audacious.pc
-
-EXTRA_DIST = \
-  FAQ \
-  audacious.spec \
-  README.bmp \
-  $(pkgconfig_DATA) \
-  $(wildcard m4/*.m4)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile.in	Thu Feb 02 14:15:36 2006 -0800
@@ -0,0 +1,4 @@
+include mk/rules.mk
+include mk/objective.mk
+
+SUBDIRS = Plugins libaudacious audacious po icons skin intl
--- a/Plugins/Makefile.am	Thu Feb 02 13:57:20 2006 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-SUBDIRS = Input Output Visualization General Effect
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Plugins/Makefile.in	Thu Feb 02 14:15:36 2006 -0800
@@ -0,0 +1,4 @@
+include ../mk/rules.mk
+include ../mk/objective.mk
+
+SUBDIRS = Input Output Effect Visualization General
--- a/mk/objective.mk	Thu Feb 02 13:57:20 2006 -0800
+++ b/mk/objective.mk	Thu Feb 02 14:15:36 2006 -0800
@@ -1,5 +1,3 @@
-include mk/rules.mk
-
 # Shut up GNU make
 .SILENT:
 
@@ -22,10 +20,22 @@
 	@done
 	$(MAKE) install-posthook
 
+clean:
+	$(MAKE) clean-prehook
+	@for i in $(SUBDIRS); do \
+		echo "[cleaning subobjective: $$i]"; \
+		cd $$i; $(MAKE) clean; cd ..; \
+	done
+	$(MAKE) clean-posthook
+
+distclean: clean
+	$(RM) mk/rules.mk
+
 build:
 	$(MAKE) build-prehook
 	@for i in $(SUBDIRS); do \
-		cd $$i; $(MAKE) build; cd .. \
+		echo "[building subobjective: $$i]"; \
+		cd $$i; $(MAKE); cd ..; \
 	done
 	@for i in $(OBJECTIVE_LIBS); do \
 		$(MAKE) $$i; \
@@ -51,3 +61,12 @@
 	printf "%10s     %-20s\n" CXX $$i;
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
+clean-prehook:
+clean-posthook:
+build-prehook:
+build-posthook:
+install-prehook:
+install-posthook:
+
+# compatibility with automake follows
+am--refresh:
--- a/po/Makevars	Thu Feb 02 13:57:20 2006 -0800
+++ b/po/Makevars	Thu Feb 02 14:15:36 2006 -0800
@@ -15,3 +15,5 @@
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
+
+build: all