Update of /cvsroot/pure-data/abstractions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10260
Modified Files: Makefile Makefile.buildlayout README Log Message: clean targets sorted and tested. There are now standard clean targets based on the destinations which are part of Makefile.buildlayout
Index: README =================================================================== RCS file: /cvsroot/pure-data/abstractions/README,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** README 16 Nov 2005 18:23:47 -0000 1.4 --- README 18 Nov 2005 18:16:53 -0000 1.5 *************** *** 150,154 **** "applications" targets: This target is meant for any patch that is intended to be opened up and ! used, played, ran, etc. The RRADical showcase is a good example
--- 150,154 ---- "applications" targets: This target is meant for any patch that is intended to be opened up and ! used, played, ran, etc. The RRADical the-showcase.pd is a good example
Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/abstractions/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile 17 Nov 2005 00:01:55 -0000 1.8 --- Makefile 18 Nov 2005 18:16:52 -0000 1.9 *************** *** 16,19 **** --- 16,20 ---- # default target install: objects applications + echo "abstractions install succeeded!"
include $(BUILDLAYOUT_DIR)/Makefile.buildlayout *************** *** 25,28 **** --- 26,30 ---- #==============================================================================#
+ # clean up after everything is installed final_setup: chmod -R ugo-w $(INSTALL_PREFIX) *************** *** 151,159 **** objects_nusmuk: install -d $(OBJECTS_DEST)/$(NUSMUK_NAME) ! install -p $(shell ls -1 $(ABSTRACTIONS_SRC)/nusmuk/*.* | \ grep -v '-help.pd') $(OBJECTS_DEST)/$(NUSMUK_NAME) install -d $(HELP_DEST)/$(NUSMUK_NAME) install -p $(ABSTRACTIONS_SRC)/nusmuk/*-help.pd \ $(HELP_DEST)/$(NUSMUK_NAME)
--- 153,163 ---- objects_nusmuk: install -d $(OBJECTS_DEST)/$(NUSMUK_NAME) ! install -p $(shell ls -1 $(ABSTRACTIONS_SRC)/nusmuk/*.pd | \ grep -v '-help.pd') $(OBJECTS_DEST)/$(NUSMUK_NAME) install -d $(HELP_DEST)/$(NUSMUK_NAME) install -p $(ABSTRACTIONS_SRC)/nusmuk/*-help.pd \ $(HELP_DEST)/$(NUSMUK_NAME) + install -p $(ABSTRACTIONS_SRC)/nusmuk/*.wav \ + $(HELP_DEST)/$(NUSMUK_NAME)
*************** *** 174,179 **** install -p $(ABSTRACTIONS_SRC)/rradical/usecases/*.* \ $(APPLICATIONS_DEST)/$(RRADICAL_NAME) ! cp -rp $(ABSTRACTIONS_SRC)/rradical/usecases/showcase \ ! $(APPLICATIONS_DEST)/$(RRADICAL_NAME)/
#==============================================================================# --- 178,190 ---- install -p $(ABSTRACTIONS_SRC)/rradical/usecases/*.* \ $(APPLICATIONS_DEST)/$(RRADICAL_NAME) ! install -d $(APPLICATIONS_DEST)/$(RRADICAL_NAME)/showcase ! install -p $(ABSTRACTIONS_SRC)/rradical/usecases/showcase/*.* \ ! $(APPLICATIONS_DEST)/$(RRADICAL_NAME)/showcase ! install -d $(APPLICATIONS_DEST)/$(RRADICAL_NAME)/showcase/impl ! install -p $(ABSTRACTIONS_SRC)/rradical/usecases/showcase/impl/*.* \ ! $(APPLICATIONS_DEST)/$(RRADICAL_NAME)/showcase/impl ! install -d $(APPLICATIONS_DEST)/$(RRADICAL_NAME)/showcase/songs ! install -p $(ABSTRACTIONS_SRC)/rradical/usecases/showcase/songs/*.* \ ! $(APPLICATIONS_DEST)/$(RRADICAL_NAME)/showcase/songs
#==============================================================================# *************** *** 199,214 **** #==============================================================================#
! objects_clean: ! -rm -rf $(OBJECTS_DEST) $(HELP_DEST) ! ! applications_clean: ! -rm -rf $(APPLICATIONS_DEST) ! ! ! clean: applications_clean objects_clean ! -rm -f *~ ! rm -rf $(MANUALS_DEST) ! rmdir $(DOCS_DEST) $(INSTALL_PREFIX) !
#==============================================================================# --- 210,215 ---- #==============================================================================#
! # the destination-specific clean targets are in Makefile.buildlayout ! clean: install_clean cruft_clean
#==============================================================================#
Index: Makefile.buildlayout =================================================================== RCS file: /cvsroot/pure-data/abstractions/Makefile.buildlayout,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.buildlayout 17 Nov 2005 00:01:55 -0000 1.1 --- Makefile.buildlayout 18 Nov 2005 18:16:53 -0000 1.2 *************** *** 1,5 **** ! ! ## Makefile.buildlayout ! # 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. --- 1,10 ---- ! #==============================================================================# ! # ! # Centralized cross-platform build system Makefile.buildsystem ! # ! # this file contains all the common locations and targets ! # hans@at.or.at ! # ! #==============================================================================# # 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. *************** *** 26,29 **** --- 31,67 ---- # hans@at.or.at
+ #==============================================================================# + # + ## PLATFORM-SPECIFIC SETTINGS + # + #==============================================================================# + # which OS to compile for + UNAME := $(shell uname -s) + ifeq ($(UNAME),Linux) + OS_NAME = linux + EXTENSION = pd_linux + else + ifeq ($(UNAME),Darwin) + OS_NAME = darwin + EXTENSION = pd_darwin + else + ifeq (MINGW,$(findstring MINGW,$(UNAME))) + OS_NAME = win + EXTENSION = dll + else + OS_NAME = unknown + EXTENSION = so + $(warning WARNING: unknown environment "$(UNAME)".) + endif + endif + endif + + + #==============================================================================# + # + # DIRECTORY STRUCTURE + # + #==============================================================================# + # sources ABSTRACTIONS_SRC = $(SRC_ROOT_DIR)/abstractions *************** *** 44,50 **** MANUALS_DEST = $(DOCS_DEST)/manuals
! #------------------------------------------------------------------------------# # DIRECTORY STRUCTURE TARGETS ! #------------------------------------------------------------------------------# # first make sure that the directory structure is setup $(INSTALL_PREFIX): --- 82,92 ---- MANUALS_DEST = $(DOCS_DEST)/manuals
! ! #==============================================================================# ! # # DIRECTORY STRUCTURE TARGETS ! # ! #==============================================================================# ! # first make sure that the directory structure is setup $(INSTALL_PREFIX): *************** *** 66,67 **** --- 108,186 ---- 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 + +