Browse code

Fix: Dashes are also converted to underscores

Lorenz Hüdepohl authored on21/05/2015 17:40:19
Showing3 changed files
... ...
@@ -7,7 +7,7 @@
7 7
 _f90_verbose = $(_f90_verbose_$(V))
8 8
 _f90_verbose_ = $(_f90_verbose_$(AM_DEFAULT_VERBOSITY))
9 9
 _f90_verbose_0 = @echo "  $1";
10
-_f90_targets = $(subst .,_,$(bin_PROGRAMS) $(lib_LTLIBRARIES))
10
+_f90_targets = $(subst -,_,$(subst .,_,$(bin_PROGRAMS) $(lib_LTLIBRARIES)))
11 11
 
12 12
 FORTRAN_CPP ?= cpp -P -traditional -Wall -Werror
13 13
 
... ...
@@ -18,10 +18,10 @@ test_baz_CPPFLAGS = -DPROGRAM_test_baz
18 18
 test_baz_FCFLAGS = $(FC_MODOUT)./fortran_mod_files/test_baz $(FC_MODINC)./fortran_mod_files/test_baz
19 19
 
20 20
 # a library
21
-lib_LTLIBRARIES = libdings.la
21
+lib_LTLIBRARIES = libdings-2.la
22 22
 
23
-libdings_la_SOURCES = src2/baz.F90 src/bar.F90
24
-libdings_la_FCFLAGS = $(FC_MODOUT)./fortran_mod_files/libdings.la $(FC_MODINC)./fortran_mod_files/libdings.la
23
+libdings_2_la_SOURCES = src2/baz.F90 src/bar.F90
24
+libdings_2_la_FCFLAGS = $(FC_MODOUT)./fortran_mod_files/libdings-2.la $(FC_MODINC)./fortran_mod_files/libdings-2.la
25 25
 
26 26
 CLEANFILES = fortran_mod_files/*/*
27 27
 
... ...
@@ -32,6 +32,6 @@ AC_SUBST([FC_MODOUT])
32 32
 AC_CONFIG_FILES([Makefile])
33 33
 AC_OUTPUT
34 34
 
35
-for target in foo test_bar test_baz libdings.la; do
35
+for target in foo test_bar test_baz libdings-2.la; do
36 36
 	mkdir -p fortran_mod_files/$target
37 37
 done