From d4eb4cb7fda774d4b114888a1c694db0575bdf24 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 18 Nov 2005 18:19:40 +0000 Subject: clean targets sorted and tested. There are now standard clean targets based on the destinations which are part of Makefile.buildlayout svn path=/trunk/; revision=3965 --- externals/Makefile | 43 +++------------- externals/Makefile.buildlayout | 112 ++++++++++++++++++++++++++++++++++++++--- externals/README | 6 +++ 3 files changed, 118 insertions(+), 43 deletions(-) create mode 100644 externals/README (limited to 'externals') diff --git a/externals/Makefile b/externals/Makefile index 5da699bf..56797d8e 100644 --- a/externals/Makefile +++ b/externals/Makefile @@ -39,7 +39,7 @@ DEST_PATHS = BUILDLAYOUT_DIR=$(BUILDLAYOUT_DIR) \ objects: objects_$(OS_NAME) @echo "Compiling objects for $(OS_NAME) aka $(UNAME)" # try it this way so that it'll recognize files that have already been built - cd $(EXTERNALS_SRC)/build/$(OS_NAME) && make -k + cd $(EXTERNALS_SRC)/build/$(OS_NAME) && make -k # these targets are for platform-specific needs objects_darwin: @@ -67,10 +67,11 @@ applications_install: $(APPLICATIONS_DEST) $(APPLICATIONS_DEST)/$(IEMLIB_NAME) # PMDP examples install -d $(APPLICATIONS_DEST)/$(PMPD_NAME) - install -p $(EXTERNALS_SRC)/pmpd/exemples/*.pd $(APPLICATIONS_DEST)/$(PMPD_NAME) + install -p $(EXTERNALS_SRC)/pmpd/exemples/*.pd \ + $(APPLICATIONS_DEST)/$(PMPD_NAME) -docs_install: $(HELP_DEST) +help_install: $(HELP_DEST) #------------------------------------------------------------------------------# # all standard objs' help files # it had to be broken up because the list is soo long @@ -173,8 +174,9 @@ objects_install: objects -install: $(OBJECTS_DEST) docs_install applications_install objects_install +install: $(OBJECTS_DEST) help_install applications_install objects_install install: manuals_install + @echo "externals install succeeded!" #==============================================================================# # @@ -186,34 +188,5 @@ install: manuals_install devsymlinks: -#==============================================================================# -# -# CLEAN TARGETS -# -#==============================================================================# - -applications_clean: - rm $(APPLICATIONS_DEST)/*/*.* - rmdir $(APPLICATIONS_DEST)/* - rmdir $(APPLICATIONS_DEST) - -docs_clean: - -rm $(HELP_DEST)/*.* $(HELP_DEST)/*/*.* - rmdir $(HELP_DEST)/* - -manuals_clean: - rm $(MANUALS_DEST)/*/*.* - rmdir $(MANUALS_DEST)/* - rmdir $(MANUALS_DEST) - -objects_clean: - rm $(OBJECTS_DEST)/*.pd - rm $(OBJECTS_DEST)/*/*.pd - rm $(OBJECTS_DEST)/*.$(EXTENSION) -# for upcoming lib directory structure - -rm $(OBJECTS_DEST)/*/*.$(EXTENSION) - rmdir $(OBJECTS_DEST)/* - -clean: applications_clean docs_clean manuals_clean objects_clean - rmdir $(DOCS_DEST)/* - rmdir $(DOCS_DEST) +# FYI: clean targets are in Makefile.buildlayout +clean: install_clean cruft_clean diff --git a/externals/Makefile.buildlayout b/externals/Makefile.buildlayout index 5a2ec76c..a5a85e6d 100644 --- a/externals/Makefile.buildlayout +++ b/externals/Makefile.buildlayout @@ -1,6 +1,11 @@ - -## Makefile.buildlayout - +#==============================================================================# +# +# Centralized cross-platform build system Makefile.buildsystem +# +# this file contains all the common locations and targets +# +# +#==============================================================================# # This file should be exactly the same in each section of the CVS. A copy is # kept in each section of the CVS so that each section will be self-contained. # To use it, you need to include it in your Makefile (i.e. "include @@ -25,9 +30,11 @@ # # -#------------------------------------------------------------------------------# -# PLATFORM-SPECIFIC SETTINGS -#------------------------------------------------------------------------------# +#==============================================================================# +# +## PLATFORM-SPECIFIC SETTINGS +# +#==============================================================================# # which OS to compile for UNAME := $(shell uname -s) ifeq ($(UNAME),Linux) @@ -49,6 +56,13 @@ else endif endif + +#==============================================================================# +# +# DIRECTORY STRUCTURE +# +#==============================================================================# + # sources ABSTRACTIONS_SRC = $(SRC_ROOT_DIR)/abstractions DOC_SRC = $(SRC_ROOT_DIR)/doc @@ -67,9 +81,13 @@ OBJECTS_DEST = $(INSTALL_PREFIX)/extra HELP_DEST = $(DOCS_DEST)/5.reference MANUALS_DEST = $(DOCS_DEST)/manuals -#------------------------------------------------------------------------------# + +#==============================================================================# +# # DIRECTORY STRUCTURE TARGETS -#------------------------------------------------------------------------------# +# +#==============================================================================# + # first make sure that the directory structure is setup $(INSTALL_PREFIX): install -d $(INSTALL_PREFIX) @@ -88,3 +106,81 @@ $(MANUALS_DEST): $(INSTALL_PREFIX) $(OBJECTS_DEST): $(INSTALL_PREFIX) install -d $(OBJECTS_DEST) + + +#==============================================================================# +# +# CLEAN TARGETS +# +#==============================================================================# + +applications_clean: + -rm -f -- $(APPLICATIONS_DEST)/*/*/*/*/*.* + -rm -f -- $(APPLICATIONS_DEST)/*/*/*/*.* + -rm -f -- $(APPLICATIONS_DEST)/*/*/*.* + -rm -f -- $(APPLICATIONS_DEST)/*/*.* + -rmdir $(APPLICATIONS_DEST)/*/*/*/* + -rmdir $(APPLICATIONS_DEST)/*/*/* + -rmdir $(APPLICATIONS_DEST)/*/* + -rmdir $(APPLICATIONS_DEST)/* + -rmdir $(APPLICATIONS_DEST) + + +help_clean: + -rm -f -- $(HELP_DEST)/*/*/*.* + -rm -f -- $(HELP_DEST)/*/*.* + -rm -f -- $(HELP_DEST)/*.* + -rmdir $(HELP_DEST)/*/* + -rmdir $(HELP_DEST)/* + -rmdir $(HELP_DEST) + + +manuals_clean: + -rm -f -- $(MANUALS_DEST)/*/*/*.* + -rm -f -- $(MANUALS_DEST)/*/*.* + -rmdir $(MANUALS_DEST)/*/* + -rmdir $(MANUALS_DEST)/* + -rmdir $(MANUALS_DEST) + + +objects_clean: + -rm $(OBJECTS_DEST)/*/*/*.pd + -rm $(OBJECTS_DEST)/*/*.pd + -rm $(OBJECTS_DEST)/*.pd + -rm $(OBJECTS_DEST)/*/*/*.$(EXTENSION) + -rm $(OBJECTS_DEST)/*/*.$(EXTENSION) + -rm $(OBJECTS_DEST)/*.$(EXTENSION) + -rmdir $(OBJECTS_DEST)/*/* + -rmdir $(OBJECTS_DEST)/* + -rmdir $(OBJECTS_DEST) + + +install_clean: applications_clean help_clean manuals_clean objects_clean + -rmdir $(DOCS_DEST) + -rmdir $(INSTALL_PREFIX) + @echo " " + @echo "Build destination cleaned: $(INSTALL_PREFIX)" + + +cruft_clean: +# emacs litter + -rm -f -- */*/*/*/*.*~ + -rm -f -- */*/*/*.*~ + -rm -f -- */*/*.*~ + -rm -f -- */*.*~ + -rm -f -- *.*~ + -rm -f -- Makefile~ Makefile.buildlayout~ +# sed replace litter + -rm -f -- */*/*/*/*.*.bak + -rm -f -- */*/*/*.*.bak + -rm -f -- */*/*.*.bak + -rm -f -- */*.*.bak + -rm -f -- *.*.bak +# autoconf cache + -rm -rf -- */*/*/*/autom4te.cache + -rm -rf -- */*/*/autom4te.cache + -rm -rf -- */*/autom4te.cache + -rm -rf -- */autom4te.cache + -rm -rf -- autom4te.cache + + diff --git a/externals/README b/externals/README new file mode 100644 index 00000000..9a86e6ca --- /dev/null +++ b/externals/README @@ -0,0 +1,6 @@ + +See docs on this page for instructions: + +http://puredata.org/docs/developer/ + + -- cgit v1.2.1