Commit 2e293869 authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

is it time to move away from gnu make?

parent 56aa6cb9

Makefile

+0 −3
Original line number Diff line number Diff line 
# DrSPINE Makefile



export FC     =gfortran

export FCFLAGS=-g -O3

export LDFLAGS=$(FCFLAGS)

export INSTALL=install

export MKDIR_P=mkdir -p

Makefile.common

+23 −4
Original line number Diff line number Diff line 
# -*- Makefile -*-

# vim: filetype=make



export PROJECT=drspine

export PROJLIB=lib$(PROJECT).a

export PROJARCH=$(PROJECT)-$(VERSION_MAJOR).$(VERSION_MINOR)



git_rev=$(shell git rev-parse --short HEAD 2> /dev/null)

ifeq "$(git_rev)" ""

   git_rev='dev'

endif

export BUILD_REVISION=$(git_rev)



# check for makedepend

MAKEDEPEND := $(shell command -v makedepend 2> /dev/null)

MAKEDEPF90 := $(shell command -v makedepf90 2> /dev/null)

HASMAKEDEP := $(and $(MAKEDEPEND),$(MAKEDEPF90))



# defines

DEFINES+=-D_VERSION_MAJOR_=$(VERSION_MAJOR) -D_VERSION_MINOR_=$(VERSION_MINOR) -D_VERSION_RELEASE_=\"$(VERSION_RELEASE)\"

DEFINES+=-D_BUILD_REVISION_=\"$(BUILD_REVISION)\"

DEFINES+=-D_DEFAULT_INSTRUMENT_=$(INSTRUMENT)



# GR Framework

ifneq ($(GRDIR),)

ifeq  ($(GRDIR),pkg-config)

LDFLAGS += $(shell pkg-config --libs-only-L GR)
@@ -14,21 +31,23 @@ endif 
LDLIBS  += -lGR

endif



# HDF5 Library

ifneq ($(HDF5DIR),)

ifeq  ($(HDF5DIR),pkg-config)

FCFLAGS += $(shell pkg-config --cflags      hdf5)

FFLAGS  += $(shell pkg-config --cflags      hdf5)

LDFLAGS += $(shell pkg-config --libs-only-L hdf5) 

else

FCFLAGS += -I$(HDF5DIR)/include

FFLAGS  += -I$(HDF5DIR)/include

LDFLAGS += -L$(HDF5DIR)/lib 

endif

LDLIBS  += -lhdf5_fortran -lhdf5

endif





# implicit rules

%.o: %.F90

	$(FC) $(FCFLAGS) $(DEFINES) -c -o $@ $<

	$(FC) $(FFLAGS) $(DEFINES) -c -o $@ $<



%.o: %.f90

	$(FC) $(FCFLAGS)            -c -o $@ $<

	$(FC) $(FFLAGS)            -c -o $@ $<

Makefile.def.in

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ INSTRUMENT=1 
# Fortran compiler (use ifort or gfortran)

FC     = gfortran

# Fortran compiler flags

FCFLAGS = -g

FFLAGS = -g



#external libraries (set to empty to disable)

GRDIR   = /usr/local/gr

Makefile.version

+0 −21
Original line number Diff line number Diff line 
# DrSPINE Makefile (version information)

export PROJECT=drspine



export VERSION_MAJOR=2

export VERSION_MINOR=1

export VERSION_RELEASE=a1
 


export PROJLIB=lib$(PROJECT).a

export PROJARCH=$(PROJECT)-$(VERSION_MAJOR).$(VERSION_MINOR)



git_rev=$(shell git rev-parse --short HEAD 2> /dev/null)

ifeq "$(git_rev)" ""

   git_rev='dev'

endif

export BUILD_REVISION=$(git_rev)



DEFINES+=-D_VERSION_MAJOR_=$(VERSION_MAJOR) -D_VERSION_MINOR_=$(VERSION_MINOR) -D_VERSION_RELEASE_=\"$(VERSION_RELEASE)\"

DEFINES+=-D_BUILD_REVISION_=\"$(BUILD_REVISION)\"





#git_tag=$(shell git describe --tags --abbrev=0 HEAD 2> /dev/null)

#ifeq "$(git_tag)" ""

#   git_tag='unknown'

#endif

#export VERSION_TAGNUMBER=$(git_tag)

sources/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ else 
FC     = ifort

endif

CC     = cc

CFLAGS =

FCFLAGS=

AR     = ar

ARFLAGS= cr

GRDIR  = /usr/local/gr
@@ -17,8 +15,6 @@ INSTRUMENT=1 # default instrument 1=SNS-NSE, 2=J-NSE, see drspine_parameters.f9 
-include ../Makefile.version

-include ../Makefile.common





DEFINES+=-D_DEFAULT_INSTRUMENT_=$(INSTRUMENT)

LDLIBS:=$(PROJLIB) $(LDLIBS)



PROGSRC=\