From 35308529422cf3d8ad818c8a369e5f37818f875a Mon Sep 17 00:00:00 2001 From: Björn Persson Date: Sun, 16 Jun 2013 23:42:41 +0200 Subject: Changed the default suffix of files to be preprocessed. --- comfignat.gpr.gp | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ comfignat.gpr.in | 110 ------------------------------------------------------- comfignat.mk | 4 +- 3 files changed, 112 insertions(+), 112 deletions(-) create mode 100644 comfignat.gpr.gp delete mode 100644 comfignat.gpr.in diff --git a/comfignat.gpr.gp b/comfignat.gpr.gp new file mode 100644 index 0000000..fdbdcba --- /dev/null +++ b/comfignat.gpr.gp @@ -0,0 +1,110 @@ +-- Comfignat configuration variables for GNAT project files +-- Copyright 2013 B. Persson, Bjorn@Rombobeorn.se +-- +-- This material is provided as is, with absolutely no warranty expressed +-- or implied. Any use is at your own risk. +-- +-- Permission is hereby granted to use or copy this project file +-- for any purpose, provided the above notices are retained on all copies. +-- Permission to modify the code and to distribute modified code is granted, +-- provided the above notices are retained, and a notice that the code was +-- modified is included with the above copyright notice. + + +-- This project file defines directory variables for use in build-controlling +-- project files. It is not to be installed on the target system. +-- +-- Normally the preprocessing of this file will be controlled by comfignat.mk, +-- which will make it import the directories project if one is provided. It can +-- also be preprocessed manually if Make cannot be used for some reason. There +-- are defaults that will be used if no preprocessor symbols are defined. + + +#if Directories_GPR'Defined then + with $Directories_GPR; +#end if; + +abstract project Comfignat is + + #if Objdir'Defined then + Objdir := $Objdir; + #else + Objdir := "build"; + #end if; + -- Intermediate files produced during the build shall be kept in Objdir. + + #if Directories_Project'Defined then + -- Put intermediate files for different architectures in subdirectories + -- where they won't conflict with each other. (This is useful especially + -- with binder files when they are packaged in debug information packages + -- for multiarch systems.) + Objdir := Objdir & "/" & $Directories_Project.Hardware_Platform; + #end if; + + #if Stagedir'Defined then + Stagedir := $Stagedir; + #else + Stagedir := external("DESTDIR", ""); + #end if; + -- Files to be installed shall be placed under Stagedir instead of the root + -- directory. + + #if Base'Defined then + Prepath := Stagedir & $Base & "/"; + #else + Prepath := Stagedir; + #end if; + -- If Prefix, Exec_Prefix, Bindir, Libexecdir, Includedir and Libdir are + -- relative pathnames, then Base shall be the absolute pathname of the + -- directory that they are relative to. If those variables are absolute + -- pathnames, then Base shall be undefined. + + #if Prefix'Defined then + Prefix := $Prefix; + #else + Prefix := "/usr/local"; + #end if; + + #if Exec_Prefix'Defined then + Exec_Prefix := $Exec_Prefix; + #else + Exec_Prefix := Prefix; + #end if; + + #if Bindir'Defined then + Bindir := $Bindir; + #else + Bindir := Exec_Prefix & "/bin"; + #end if; + Stage_Bindir := Prepath & Bindir; + -- Programs that can be run from a command prompt shall be installed in + -- Stage_Bindir. + + #if Libexecdir'Defined then + Libexecdir := $Libexecdir; + #else + Libexecdir := Exec_Prefix & "/libexec"; + #end if; + Stage_Libexecdir := Prepath & Libexecdir; + -- Programs that are only to be run by other programs, not by users, shall + -- be installed under Stage_Libexecdir. + + #if Includedir'Defined then + Includedir := $Includedir; + #else + Includedir := Prefix & "/include"; + #end if; + Stage_Includedir := Prepath & Includedir; + -- Source files needed for compiling code that uses a library shall be + -- installed under Stage_Includedir. + + #if Libdir'Defined then + Libdir := $Libdir; + #else + Libdir := Prefix & "/lib"; + #end if; + Stage_Libdir := Prepath & Libdir; + -- Binary libraries shall be installed in Stage_Libdir. + -- ALI files shall be installed in a subdirectory of Stage_Libdir. + +end Comfignat; diff --git a/comfignat.gpr.in b/comfignat.gpr.in deleted file mode 100644 index fdbdcba..0000000 --- a/comfignat.gpr.in +++ /dev/null @@ -1,110 +0,0 @@ --- Comfignat configuration variables for GNAT project files --- Copyright 2013 B. Persson, Bjorn@Rombobeorn.se --- --- This material is provided as is, with absolutely no warranty expressed --- or implied. Any use is at your own risk. --- --- Permission is hereby granted to use or copy this project file --- for any purpose, provided the above notices are retained on all copies. --- Permission to modify the code and to distribute modified code is granted, --- provided the above notices are retained, and a notice that the code was --- modified is included with the above copyright notice. - - --- This project file defines directory variables for use in build-controlling --- project files. It is not to be installed on the target system. --- --- Normally the preprocessing of this file will be controlled by comfignat.mk, --- which will make it import the directories project if one is provided. It can --- also be preprocessed manually if Make cannot be used for some reason. There --- are defaults that will be used if no preprocessor symbols are defined. - - -#if Directories_GPR'Defined then - with $Directories_GPR; -#end if; - -abstract project Comfignat is - - #if Objdir'Defined then - Objdir := $Objdir; - #else - Objdir := "build"; - #end if; - -- Intermediate files produced during the build shall be kept in Objdir. - - #if Directories_Project'Defined then - -- Put intermediate files for different architectures in subdirectories - -- where they won't conflict with each other. (This is useful especially - -- with binder files when they are packaged in debug information packages - -- for multiarch systems.) - Objdir := Objdir & "/" & $Directories_Project.Hardware_Platform; - #end if; - - #if Stagedir'Defined then - Stagedir := $Stagedir; - #else - Stagedir := external("DESTDIR", ""); - #end if; - -- Files to be installed shall be placed under Stagedir instead of the root - -- directory. - - #if Base'Defined then - Prepath := Stagedir & $Base & "/"; - #else - Prepath := Stagedir; - #end if; - -- If Prefix, Exec_Prefix, Bindir, Libexecdir, Includedir and Libdir are - -- relative pathnames, then Base shall be the absolute pathname of the - -- directory that they are relative to. If those variables are absolute - -- pathnames, then Base shall be undefined. - - #if Prefix'Defined then - Prefix := $Prefix; - #else - Prefix := "/usr/local"; - #end if; - - #if Exec_Prefix'Defined then - Exec_Prefix := $Exec_Prefix; - #else - Exec_Prefix := Prefix; - #end if; - - #if Bindir'Defined then - Bindir := $Bindir; - #else - Bindir := Exec_Prefix & "/bin"; - #end if; - Stage_Bindir := Prepath & Bindir; - -- Programs that can be run from a command prompt shall be installed in - -- Stage_Bindir. - - #if Libexecdir'Defined then - Libexecdir := $Libexecdir; - #else - Libexecdir := Exec_Prefix & "/libexec"; - #end if; - Stage_Libexecdir := Prepath & Libexecdir; - -- Programs that are only to be run by other programs, not by users, shall - -- be installed under Stage_Libexecdir. - - #if Includedir'Defined then - Includedir := $Includedir; - #else - Includedir := Prefix & "/include"; - #end if; - Stage_Includedir := Prepath & Includedir; - -- Source files needed for compiling code that uses a library shall be - -- installed under Stage_Includedir. - - #if Libdir'Defined then - Libdir := $Libdir; - #else - Libdir := Prefix & "/lib"; - #end if; - Stage_Libdir := Prepath & Libdir; - -- Binary libraries shall be installed in Stage_Libdir. - -- ALI files shall be installed in a subdirectory of Stage_Libdir. - -end Comfignat; diff --git a/comfignat.mk b/comfignat.mk index 04d5caa..49da99f 100644 --- a/comfignat.mk +++ b/comfignat.mk @@ -127,7 +127,7 @@ install_cp_flags = ${if ${DESTDIR},--preserve=timestamps,} # ifneq (${origin preprocessed_files},file) - preprocessed_files := ${basename ${wildcard *.in}} + preprocessed_files := ${basename ${wildcard *.gp}} endif # preprocessed_files is a list of files to be produced in the preprocessing # step at the beginning of the build. Containing makefiles may override it or @@ -350,7 +350,7 @@ configure:: # configured variable. It is therefore possible to delete a variable V from the # configuration by running "make configure V_is_configured=false". -%.gpr: %.gpr.in +%.gpr: %.gpr.gp "${GNATPREP}" $< $@ ${definitions} preprocess: $${preprocessed_files} -- cgit v1.2.3