Commit 0c4d8340 authored by Benjamin Beauchesne's avatar Benjamin Beauchesne
Browse files

Correction of the bug relative to global variable defined more than one time....

Correction of the bug relative to global variable defined more than one time. I added the -fcommon options in src/Makefile.am and utils/Makefile.am and I runned automake for Makefile.in files. The codes compile well with gcc11.
parent 0eacb7ab
......@@ -2,7 +2,7 @@
noinst_LIBRARIES = liblenstool.a
AM_CFLAGS = @CFITSIO_HDR@ @WCS_HDR@ @GSL_HDR@ -I@top_srcdir@/include \
-I@top_srcdir@/liblt
-I@top_srcdir@/liblt -fcommon
#AM_CFLAGS = @CFITSIO_HDR@ @WCS_HDR@ -I@top_srcdir@/include \
# -I@top_srcdir@/liblt -I@top_srcdir@/libnest
......
# Makefile.in generated by automake 1.16.1 from Makefile.am.
# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -511,7 +511,7 @@ top_srcdir = @top_srcdir@
# Program Makefile for lenstool
noinst_LIBRARIES = liblenstool.a
AM_CFLAGS = @CFITSIO_HDR@ @WCS_HDR@ @GSL_HDR@ -I@top_srcdir@/include \
-I@top_srcdir@/liblt
-I@top_srcdir@/liblt -fcommon
#AM_CFLAGS = @CFITSIO_HDR@ @WCS_HDR@ -I@top_srcdir@/include \
# -I@top_srcdir@/liblt -I@top_srcdir@/libnest
......
......@@ -4,7 +4,7 @@ bin_PROGRAMS += Histogram Histogram2D
endif
AM_FFLAGS = -fPIC -w -O3 -fno-automatic -finit-local-zero --fixed-line-length-none
AM_CFLAGS = -I@top_srcdir@/include -I@top_srcdir@/liblt @GSL_HDR@
AM_CFLAGS = -I@top_srcdir@/include -I@top_srcdir@/liblt @GSL_HDR@ -fcommon
bayesChires_SOURCES = bayesChires.c
bayesImage_SOURCES = bayesImage.c
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -90,7 +90,7 @@ bin_PROGRAMS = bayesChires$(EXEEXT) bayesImage$(EXEEXT) \
bayesSource$(EXEEXT) bayesBest$(EXEEXT) bayesDlsDs$(EXEEXT) \
bayesGrad$(EXEEXT) bayesMap$(EXEEXT) bayesAmp$(EXEEXT) \
bayesM200$(EXEEXT) bayesCl$(EXEEXT) bayesCleanlens$(EXEEXT) \
bayesClump$(EXEEXT) $(am__EXEEXT_1)
bayesClump$(EXEEXT) bayesModel$(EXEEXT) $(am__EXEEXT_1)
@PGPLOT_TRUE@am__append_1 = Histogram Histogram2D
subdir = utils
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
......@@ -178,6 +178,12 @@ bayesMap_DEPENDENCIES = @top_builddir@/src/liblenstool.a \
@top_builddir@/liblt/liblt.a
bayesMap_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(bayesMap_LDFLAGS) \
$(LDFLAGS) -o $@
am_bayesModel_OBJECTS = bayesModel.$(OBJEXT)
bayesModel_OBJECTS = $(am_bayesModel_OBJECTS)
bayesModel_DEPENDENCIES = @top_builddir@/src/liblenstool.a \
@top_builddir@/liblt/liblt.a
bayesModel_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(bayesModel_LDFLAGS) \
$(LDFLAGS) -o $@
am_bayesSource_OBJECTS = bayesSource.$(OBJEXT)
bayesSource_OBJECTS = $(am_bayesSource_OBJECTS)
bayesSource_DEPENDENCIES = @top_builddir@/src/liblenstool.a \
......@@ -198,7 +204,14 @@ am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp
am__depfiles_maybe = depfiles
am__maybe_remake_depfiles = depfiles
am__depfiles_remade = ./$(DEPDIR)/bayesAmp.Po ./$(DEPDIR)/bayesBest.Po \
./$(DEPDIR)/bayesChires.Po ./$(DEPDIR)/bayesCl.Po \
./$(DEPDIR)/bayesCleanlens.Po ./$(DEPDIR)/bayesClump.Po \
./$(DEPDIR)/bayesDlsDs.Po ./$(DEPDIR)/bayesGrad.Po \
./$(DEPDIR)/bayesImage.Po ./$(DEPDIR)/bayesM200.Po \
./$(DEPDIR)/bayesMap.Po ./$(DEPDIR)/bayesModel.Po \
./$(DEPDIR)/bayesSource.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
......@@ -230,14 +243,14 @@ SOURCES = $(Histogram_SOURCES) $(Histogram2D_SOURCES) \
$(bayesCleanlens_SOURCES) $(bayesClump_SOURCES) \
$(bayesDlsDs_SOURCES) $(bayesGrad_SOURCES) \
$(bayesImage_SOURCES) $(bayesM200_SOURCES) $(bayesMap_SOURCES) \
$(bayesSource_SOURCES)
$(bayesModel_SOURCES) $(bayesSource_SOURCES)
DIST_SOURCES = $(am__Histogram_SOURCES_DIST) \
$(am__Histogram2D_SOURCES_DIST) $(bayesAmp_SOURCES) \
$(bayesBest_SOURCES) $(bayesChires_SOURCES) $(bayesCl_SOURCES) \
$(bayesCleanlens_SOURCES) $(bayesClump_SOURCES) \
$(bayesDlsDs_SOURCES) $(bayesGrad_SOURCES) \
$(bayesImage_SOURCES) $(bayesM200_SOURCES) $(bayesMap_SOURCES) \
$(bayesSource_SOURCES)
$(bayesModel_SOURCES) $(bayesSource_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
......@@ -371,7 +384,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_FFLAGS = -fPIC -w -O3 -fno-automatic -finit-local-zero --fixed-line-length-none
AM_CFLAGS = -I@top_srcdir@/include -I@top_srcdir@/liblt @GSL_HDR@
AM_CFLAGS = -I@top_srcdir@/include -I@top_srcdir@/liblt @GSL_HDR@ -fcommon
bayesChires_SOURCES = bayesChires.c
bayesImage_SOURCES = bayesImage.c
bayesSource_SOURCES = bayesSource.c
......@@ -384,6 +397,7 @@ bayesM200_SOURCES = bayesM200.c
bayesCl_SOURCES = bayesCl.c
bayesCleanlens_SOURCES = bayesCleanlens.c
bayesClump_SOURCES = bayesClump.c
bayesModel_SOURCES = bayesModel.c
bayesChires_LDFLAGS = @CFITSIO_LIB@ @WCS_LIB@ @GSL_LIB@
bayesChires_LDADD = @top_builddir@/src/liblenstool.a \
@top_builddir@/liblt/liblt.a @CFITSIO_STATIC@ @WCS_STATIC@ -lm @GSL_STATIC@
......@@ -432,6 +446,10 @@ bayesClump_LDFLAGS = @CFITSIO_LIB@ @WCS_LIB@ @GSL_LIB@
bayesClump_LDADD = @top_builddir@/src/liblenstool.a \
@top_builddir@/liblt/liblt.a @CFITSIO_STATIC@ @WCS_STATIC@ -lm @GSL_STATIC@
bayesModel_LDFLAGS = @CFITSIO_LIB@ @WCS_LIB@ @GSL_LIB@
bayesModel_LDADD = @top_builddir@/src/liblenstool.a \
@top_builddir@/liblt/liblt.a @CFITSIO_STATIC@ @WCS_STATIC@ -lm @GSL_STATIC@
@PGPLOT_TRUE@Histogram_SOURCES = histogram.f
@PGPLOT_TRUE@Histogram2D_SOURCES = histogram2D.f
......@@ -466,8 +484,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
......@@ -573,6 +591,10 @@ bayesMap$(EXEEXT): $(bayesMap_OBJECTS) $(bayesMap_DEPENDENCIES) $(EXTRA_bayesMap
@rm -f bayesMap$(EXEEXT)
$(AM_V_CCLD)$(bayesMap_LINK) $(bayesMap_OBJECTS) $(bayesMap_LDADD) $(LIBS)
bayesModel$(EXEEXT): $(bayesModel_OBJECTS) $(bayesModel_DEPENDENCIES) $(EXTRA_bayesModel_DEPENDENCIES)
@rm -f bayesModel$(EXEEXT)
$(AM_V_CCLD)$(bayesModel_LINK) $(bayesModel_OBJECTS) $(bayesModel_LDADD) $(LIBS)
bayesSource$(EXEEXT): $(bayesSource_OBJECTS) $(bayesSource_DEPENDENCIES) $(EXTRA_bayesSource_DEPENDENCIES)
@rm -f bayesSource$(EXEEXT)
$(AM_V_CCLD)$(bayesSource_LINK) $(bayesSource_OBJECTS) $(bayesSource_LDADD) $(LIBS)
......@@ -583,18 +605,25 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bayesAmp.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bayesBest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bayesChires.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bayesCl.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bayesCleanlens.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bayesClump.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bayesDlsDs.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bayesGrad.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bayesImage.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bayesM200.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bayesMap.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bayesSource.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bayesAmp.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bayesBest.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bayesChires.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bayesCl.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bayesCleanlens.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bayesClump.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bayesDlsDs.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bayesGrad.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bayesImage.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bayesM200.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bayesMap.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bayesModel.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bayesSource.Po@am__quote@ # am--include-marker
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
@echo '# dummy' >$@-t && $(am__mv) $@-t $@
am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
......@@ -668,7 +697,10 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
......@@ -740,7 +772,19 @@ clean: clean-am
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
-rm -f ./$(DEPDIR)/bayesAmp.Po
-rm -f ./$(DEPDIR)/bayesBest.Po
-rm -f ./$(DEPDIR)/bayesChires.Po
-rm -f ./$(DEPDIR)/bayesCl.Po
-rm -f ./$(DEPDIR)/bayesCleanlens.Po
-rm -f ./$(DEPDIR)/bayesClump.Po
-rm -f ./$(DEPDIR)/bayesDlsDs.Po
-rm -f ./$(DEPDIR)/bayesGrad.Po
-rm -f ./$(DEPDIR)/bayesImage.Po
-rm -f ./$(DEPDIR)/bayesM200.Po
-rm -f ./$(DEPDIR)/bayesMap.Po
-rm -f ./$(DEPDIR)/bayesModel.Po
-rm -f ./$(DEPDIR)/bayesSource.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
......@@ -786,7 +830,19 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
-rm -rf ./$(DEPDIR)
-rm -f ./$(DEPDIR)/bayesAmp.Po
-rm -f ./$(DEPDIR)/bayesBest.Po
-rm -f ./$(DEPDIR)/bayesChires.Po
-rm -f ./$(DEPDIR)/bayesCl.Po
-rm -f ./$(DEPDIR)/bayesCleanlens.Po
-rm -f ./$(DEPDIR)/bayesClump.Po
-rm -f ./$(DEPDIR)/bayesDlsDs.Po
-rm -f ./$(DEPDIR)/bayesGrad.Po
-rm -f ./$(DEPDIR)/bayesImage.Po
-rm -f ./$(DEPDIR)/bayesM200.Po
-rm -f ./$(DEPDIR)/bayesMap.Po
-rm -f ./$(DEPDIR)/bayesModel.Po
-rm -f ./$(DEPDIR)/bayesSource.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
......@@ -806,7 +862,7 @@ uninstall-am: uninstall-binPROGRAMS
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
distclean distclean-compile distclean-generic distclean-tags \
distdir dvi dvi-am html html-am info info-am install \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment