From 356ddce4e67290c735f72b5dd7a5e355b7e2bef3 Mon Sep 17 00:00:00 2001 From: David Rose Date: Tue, 14 Nov 2000 01:18:49 +0000 Subject: [PATCH] *** empty log message *** --- dtool/pptempl/Template.models.pp | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dtool/pptempl/Template.models.pp b/dtool/pptempl/Template.models.pp index ad8ffbd700..567f7729a5 100644 --- a/dtool/pptempl/Template.models.pp +++ b/dtool/pptempl/Template.models.pp @@ -43,11 +43,15 @@ #define build_eggs $[sort $[build_models] $[build_chars] $[build_anims]] #define install_eggs $[sort $[SOURCES(install_egg)] $[UNPAL_SOURCES(install_egg)]] +#define install_misc $[sort $[SOURCES(install_audio install_dna)]] #define install_egg_dirs $[sort $[forscopes install_egg,$[install_model_dir]]] #define installed_eggs $[sort $[forscopes install_egg,$[SOURCES:%=$[install_model_dir]/%] $[UNPAL_SOURCES:%=$[install_model_dir]/%]]] #define installed_bams $[sort $[forscopes install_egg,$[SOURCES:%.egg=$[install_model_dir]/%.bam] $[UNPAL_SOURCES:%.egg=$[install_model_dir]/%.bam]]] +#define install_misc_dirs $[sort $[forscopes install_audio install_dna,$[install_model_dir]]] +#define installed_misc $[sort $[forscopes install_audio install_dna,$[SOURCES:%=$[install_model_dir]/%]]] + #define pal_egg_targets $[sort $[SOURCES(install_egg):%=$[pal_egg_dir]/%]] #define bam_targets $[install_eggs:%.egg=$[bam_dir]/%.bam] @@ -88,7 +92,12 @@ install-egg : $[install_egg_targets] $[installed_bams] install-bam : $[install_bam_targets] -install : install-bam +#define install_misc_targets \ + $[install_misc_dirs] \ + $[installed_misc] +install-misc : $[install_misc_targets] + +install : install-misc install-bam clean-bam : #if $[bam_targets] @@ -121,6 +130,7 @@ clean : clean-pal $[if $[POLY_MODEL(soft_char_egg)] $[NURBS_MODEL(soft_char_egg)],$[soft_maps_dir]] \ $[texattrib_dir] \ $[install_egg_dirs] \ + $[install_misc_dirs] \ ] $[directory] : @test -d $[directory] || echo mkdir -p $[directory] @@ -276,6 +286,18 @@ $[dest]/$[local] : $[sourcedir]/$[local] #end egg #end install_egg + +// Miscellaneous file installation. +#forscopes install_audio install_dna + #foreach file $[SOURCES] + #define local $[file] + #define dest $[install_model_dir] +$[dest]/$[local] : $[local] + $[INSTALL] + + #end file +#end install_audio install_dna + #end Makefile @@ -324,6 +346,7 @@ clean : $[subdirs:%=clean-%] cleanall : $[subdirs:%=cleanall-%] install-egg : $[subdirs:%=install-egg-%] install-bam : $[subdirs:%=install-bam-%] +install-misc : $[subdirs:%=install-misc-%] install : $[subdirs:%=install-%] uninstall : $[subdirs:%=uninstall-%] @@ -387,6 +410,11 @@ install-bam-$[dirname] : cd ./$[PATH] && $(MAKE) install-bam #end dirname +#formap dirname subdirs +install-misc-$[dirname] : + cd ./$[PATH] && $(MAKE) install-misc +#end dirname + #formap dirname subdirs install-$[dirname] : cd ./$[PATH] && $(MAKE) install