Changes to VT/OTF:
Fixed warnings about the need of the 'subdir-objects' option when using Automake v1.14. Due to a bug in Automake (see http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13928) the 'subdir-objects' option cannot be enabled. To get around this problem external sources files are sym linked in the current build directory (as done in ompi/mpi/c/profile) to lead Automake to believe that all source files are in the same directory. This commit was SVN r29732.
Этот коммит содержится в:
Matthias Jurenz
родитель
aa517b09a8
Коммит
3923ee89ec
@ -6,8 +6,7 @@ if AMBUILDBINARIES
|
||||
bin_PROGRAMS = otfmerge
|
||||
endif
|
||||
|
||||
OTFMERGESRCDIR = $(srcdir)
|
||||
include $(srcdir)/Makefile.common
|
||||
include Makefile.common
|
||||
|
||||
AM_CPPFLAGS = $(COMMONINCLUDES)
|
||||
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
COMMONINCLUDES = \
|
||||
-I$(OTFMERGESRCDIR) \
|
||||
-I$(top_builddir)/otflib -I$(top_srcdir)/otflib \
|
||||
-I$(top_builddir)/otfauxlib -I$(top_srcdir)/otfauxlib
|
||||
|
||||
@ -11,7 +10,7 @@ COMMONDEPENDENCIES = \
|
||||
$(top_builddir)/otflib/libopen-trace-format.la \
|
||||
$(top_builddir)/otfauxlib/libotfaux.la
|
||||
COMMONSOURCES = \
|
||||
$(OTFMERGESRCDIR)/handler.h \
|
||||
$(OTFMERGESRCDIR)/handler.c \
|
||||
$(OTFMERGESRCDIR)/otfmerge.c
|
||||
handler.h \
|
||||
handler.c \
|
||||
otfmerge.c
|
||||
|
||||
|
||||
@ -2,15 +2,19 @@ if AMBUILDBINARIES
|
||||
bin_PROGRAMS = otfmerge-mpi
|
||||
endif
|
||||
|
||||
OTFMERGESRCDIR = $(srcdir)/..
|
||||
include $(srcdir)/../Makefile.common
|
||||
include ../Makefile.common
|
||||
|
||||
$(COMMONSOURCES):
|
||||
$(LN_S) $(top_srcdir)/tools/otfmerge/$@ $@
|
||||
|
||||
CC = $(MPICC)
|
||||
|
||||
AM_CPPFLAGS = $(COMMONINCLUDES) $(MPI_INCLUDE_LINE)
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/tools/otfmerge $(COMMONINCLUDES) $(MPI_INCLUDE_LINE)
|
||||
|
||||
otfmerge_mpi_CFLAGS = -DOTFMERGE_MPI $(COMMONCFLAGS) $(MPICFLAGS)
|
||||
otfmerge_mpi_LDADD = $(COMMONLDADD) $(MPI_LIB_LINE)
|
||||
otfmerge_mpi_DEPENDENCIES = $(COMMONDEPENDENCIES)
|
||||
otfmerge_mpi_SOURCES = $(COMMONSOURCES)
|
||||
nodist_otfmerge_mpi_SOURCES = $(COMMONSOURCES)
|
||||
|
||||
CLEANFILES = $(COMMONSOURCES)
|
||||
|
||||
|
||||
@ -6,8 +6,7 @@ if AMBUILDBINARIES
|
||||
bin_PROGRAMS = otfprofile
|
||||
endif
|
||||
|
||||
OTFPROFILESRCDIR = $(srcdir)
|
||||
include $(srcdir)/Makefile.common
|
||||
include Makefile.common
|
||||
|
||||
AM_CPPFLAGS = $(COMMONINCLUDES)
|
||||
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
COMMONINCLUDES = \
|
||||
-I$(OTFPROFILESRCDIR) \
|
||||
-I$(top_builddir)/otflib -I$(top_srcdir)/otflib \
|
||||
-I$(top_builddir)/otfauxlib -I$(top_srcdir)/otfauxlib
|
||||
|
||||
@ -7,29 +6,28 @@ COMMONCXXFLAGS =
|
||||
COMMONLDADD = $(top_builddir)/otflib/libopen-trace-format.la $(MATHLIB)
|
||||
COMMONDEPENDENCIES = $(top_builddir)/otflib/libopen-trace-format.la
|
||||
COMMONSOURCES = \
|
||||
$(OTFPROFILESRCDIR)/clustering.h \
|
||||
$(OTFPROFILESRCDIR)/collect_data.h \
|
||||
$(OTFPROFILESRCDIR)/collect_dispersion.h \
|
||||
$(OTFPROFILESRCDIR)/comparison.h \
|
||||
$(OTFPROFILESRCDIR)/create_csv.h \
|
||||
$(OTFPROFILESRCDIR)/create_marker.h \
|
||||
$(OTFPROFILESRCDIR)/create_latex.h \
|
||||
$(OTFPROFILESRCDIR)/create_filter.h \
|
||||
$(OTFPROFILESRCDIR)/datastructs.h \
|
||||
$(OTFPROFILESRCDIR)/otfprofile.h \
|
||||
$(OTFPROFILESRCDIR)/process_dispersion.h \
|
||||
$(OTFPROFILESRCDIR)/summarize_data.h \
|
||||
$(OTFPROFILESRCDIR)/clustering.cpp \
|
||||
$(OTFPROFILESRCDIR)/collect_data.cpp \
|
||||
$(OTFPROFILESRCDIR)/collect_dispersion.cpp \
|
||||
$(OTFPROFILESRCDIR)/comparison_clinkage.cpp \
|
||||
$(OTFPROFILESRCDIR)/comparison_kmeans.cpp \
|
||||
$(OTFPROFILESRCDIR)/create_csv.cpp \
|
||||
$(OTFPROFILESRCDIR)/create_marker.cpp \
|
||||
$(OTFPROFILESRCDIR)/create_latex.cpp \
|
||||
$(OTFPROFILESRCDIR)/create_filter.cpp \
|
||||
$(OTFPROFILESRCDIR)/otfprofile.cpp \
|
||||
$(OTFPROFILESRCDIR)/process_dispersion.cpp \
|
||||
$(OTFPROFILESRCDIR)/summarize_data.cpp \
|
||||
$(OTFPROFILESRCDIR)/summarize_data.h
|
||||
clustering.h \
|
||||
collect_data.h \
|
||||
collect_dispersion.h \
|
||||
comparison.h \
|
||||
create_csv.h \
|
||||
create_marker.h \
|
||||
create_latex.h \
|
||||
create_filter.h \
|
||||
datastructs.h \
|
||||
otfprofile.h \
|
||||
process_dispersion.h \
|
||||
summarize_data.h \
|
||||
clustering.cpp \
|
||||
collect_data.cpp \
|
||||
collect_dispersion.cpp \
|
||||
comparison_clinkage.cpp \
|
||||
comparison_kmeans.cpp \
|
||||
create_csv.cpp \
|
||||
create_marker.cpp \
|
||||
create_latex.cpp \
|
||||
create_filter.cpp \
|
||||
otfprofile.cpp \
|
||||
process_dispersion.cpp \
|
||||
summarize_data.cpp
|
||||
|
||||
|
||||
@ -2,18 +2,22 @@ if AMBUILDBINARIES
|
||||
bin_PROGRAMS = otfprofile-mpi
|
||||
endif
|
||||
|
||||
OTFPROFILESRCDIR = $(srcdir)/..
|
||||
include $(srcdir)/../Makefile.common
|
||||
include ../Makefile.common
|
||||
|
||||
$(COMMONSOURCES):
|
||||
$(LN_S) $(top_srcdir)/tools/otfprofile/$@ $@
|
||||
|
||||
CXX = $(MPICXX)
|
||||
|
||||
AM_CPPFLAGS = $(COMMONINCLUDES) $(MPI_INCLUDE_LINE)
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/tools/otfprofile $(COMMONINCLUDES) $(MPI_INCLUDE_LINE)
|
||||
|
||||
otfprofile_mpi_CXXFLAGS = -DOTFPROFILE_MPI $(COMMONCXXFLAGS) $(MPICXXFLAGS)
|
||||
otfprofile_mpi_LDADD = $(COMMONLDADD) $(MPI_LIB_LINE)
|
||||
otfprofile_mpi_DEPENDENCIES = $(COMMONDEPENDENCIES)
|
||||
otfprofile_mpi_SOURCES = \
|
||||
$(COMMONSOURCES) \
|
||||
$(OTFPROFILESRCDIR)/reduce_data.h \
|
||||
$(OTFPROFILESRCDIR)/reduce_data.cpp
|
||||
reduce_data.h \
|
||||
reduce_data.cpp
|
||||
nodist_otfprofile_mpi_SOURCES = $(COMMONSOURCES)
|
||||
|
||||
CLEANFILES = $(COMMONSOURCES)
|
||||
|
||||
|
||||
@ -8,6 +8,8 @@ include_HEADERS = \
|
||||
../lib/opari_omp.h \
|
||||
../lib/pomp_lib.h
|
||||
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/util -I$(top_builddir)/util
|
||||
|
||||
CC = $(CC_FOR_BUILD)
|
||||
CFLAGS = $(CFLAGS_FOR_BUILD)
|
||||
CPP = $(CPP_FOR_BUILD)
|
||||
@ -18,7 +20,17 @@ CPPFLAGS = $(CPPFLAGS_FOR_BUILD)
|
||||
LDFLAGS = $(LDFLAGS_FOR_BUILD)
|
||||
LIBS = $(LIBS_FOR_BUILD)
|
||||
|
||||
# From Automake v2.0 the 'subdir-objects' option will be required to compile
|
||||
# sources located outside of the current build directory. Due to a bug in
|
||||
# Automake (see http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13928) we cannot
|
||||
# enable this option, so we have to sym link in the following source file
|
||||
# (actually located in $(top_srcdir)/util/) to lead Automake to believe that
|
||||
# all sources are located in this directory.
|
||||
UTILSOURCES = \
|
||||
util.c
|
||||
|
||||
opari_CXXFLAGS = -DOPARI_VT
|
||||
|
||||
opari_SOURCES = \
|
||||
handler.h \
|
||||
ompragma.h \
|
||||
@ -32,8 +44,16 @@ opari_SOURCES = \
|
||||
opari.cc \
|
||||
process_c.cc \
|
||||
process_f.cc \
|
||||
process_omp.cc \
|
||||
$(top_srcdir)/util/util.c
|
||||
process_omp.cc
|
||||
|
||||
nodist_opari_SOURCES = \
|
||||
$(UTILSOURCES)
|
||||
|
||||
$(UTILSOURCES):
|
||||
$(LN_S) $(top_srcdir)/util/$@
|
||||
|
||||
CLEANFILES = \
|
||||
$(UTILSOURCES)
|
||||
|
||||
EXTRA_DIST = \
|
||||
fixinc/cctype \
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
AUTOMAKE_OPTIONS = subdir-objects
|
||||
|
||||
if AMHAVEMPI
|
||||
SUBDIRS = . mpi
|
||||
endif
|
||||
@ -6,8 +8,7 @@ if AMBUILDBINARIES
|
||||
bin_PROGRAMS = vtfilter
|
||||
endif
|
||||
|
||||
VTFILTERSRCDIR = $(srcdir)
|
||||
include $(srcdir)/Makefile.common
|
||||
include Makefile.common
|
||||
|
||||
install-exec-hook:
|
||||
(cd $(DESTDIR)$(bindir); rm -f vtfiltergen$(EXEEXT); \
|
||||
|
||||
@ -8,31 +8,31 @@ OTFLIBRARY = $(top_builddir)/extlib/otf/otflib/libopen-trace-format.la
|
||||
OTFDEPENDENCIES = $(OTFLIBRARY)
|
||||
endif
|
||||
|
||||
AM_CPPFLAGS = -I$(VTFILTERSRCDIR) $(OTFINCLUDE) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/rfg -I$(top_srcdir)/vtlib
|
||||
AM_CPPFLAGS = $(OTFINCLUDE) -I$(top_srcdir)/tools/vtfilter -I$(top_srcdir)/tools/vtfilter/old -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/rfg -I$(top_srcdir)/vtlib
|
||||
|
||||
OLDSOURCES = \
|
||||
$(VTFILTERSRCDIR)/old/vt_filterc.h \
|
||||
$(VTFILTERSRCDIR)/old/vt_filthandler.h \
|
||||
$(VTFILTERSRCDIR)/old/vt_otfhandler.h \
|
||||
$(VTFILTERSRCDIR)/old/vt_filterc.cc \
|
||||
$(VTFILTERSRCDIR)/old/vt_filthandler.cc \
|
||||
$(VTFILTERSRCDIR)/old/vt_otfhandler.cc \
|
||||
$(VTFILTERSRCDIR)/old/vt_tracefilter.cc
|
||||
old/vt_filterc.h \
|
||||
old/vt_filthandler.h \
|
||||
old/vt_otfhandler.h \
|
||||
old/vt_filterc.cc \
|
||||
old/vt_filthandler.cc \
|
||||
old/vt_otfhandler.cc \
|
||||
old/vt_tracefilter.cc
|
||||
|
||||
OLDCXXFLAGS = -DVT_FILTER_OLD
|
||||
|
||||
COMMONSOURCES = \
|
||||
$(VTFILTERSRCDIR)/vt_filter.h \
|
||||
$(VTFILTERSRCDIR)/vt_filter_common.h \
|
||||
$(VTFILTERSRCDIR)/vt_filter_config.h \
|
||||
$(VTFILTERSRCDIR)/vt_filter_gen.h \
|
||||
$(VTFILTERSRCDIR)/vt_filter_trc.h \
|
||||
$(VTFILTERSRCDIR)/vt_filter_trc_hdlr.h \
|
||||
$(VTFILTERSRCDIR)/vt_filter.cc \
|
||||
$(VTFILTERSRCDIR)/vt_filter_common.cc \
|
||||
$(VTFILTERSRCDIR)/vt_filter_gen.cc \
|
||||
$(VTFILTERSRCDIR)/vt_filter_trc.cc \
|
||||
$(VTFILTERSRCDIR)/vt_filter_trc_hdlr.cc \
|
||||
vt_filter.h \
|
||||
vt_filter_common.h \
|
||||
vt_filter_config.h \
|
||||
vt_filter_gen.h \
|
||||
vt_filter_trc.h \
|
||||
vt_filter_trc_hdlr.h \
|
||||
vt_filter.cc \
|
||||
vt_filter_common.cc \
|
||||
vt_filter_gen.cc \
|
||||
vt_filter_trc.cc \
|
||||
vt_filter_trc_hdlr.cc \
|
||||
$(OLDSOURCES)
|
||||
|
||||
if AMHAVEOMP
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
AUTOMAKE_OPTIONS = subdir-objects
|
||||
|
||||
if AMBUILDBINARIES
|
||||
bin_PROGRAMS = vtfilter-mpi
|
||||
endif
|
||||
|
||||
VTFILTERSRCDIR = $(srcdir)/..
|
||||
include $(srcdir)/../Makefile.common
|
||||
include ../Makefile.common
|
||||
|
||||
install-exec-hook:
|
||||
(cd $(DESTDIR)$(bindir); rm -f vtfiltergen-mpi$(EXEEXT); \
|
||||
@ -11,11 +12,16 @@ install-exec-hook:
|
||||
uninstall-local:
|
||||
rm -f $(DESTDIR)$(bindir)/vtfiltergen-mpi$(EXEEXT)
|
||||
|
||||
$(COMMONSOURCES):
|
||||
$(LN_S) $(abs_top_srcdir)/tools/vtfilter/$@ $@
|
||||
|
||||
CXX = $(MPICXX)
|
||||
|
||||
vtfilter_mpi_CXXFLAGS = $(COMMONCXXFLAGS) -DVT_MPI $(MPICXXFLAGS) $(MPIINCDIR)
|
||||
vtfilter_mpi_LDFLAGS = $(COMMONLDFLAGS) $(MPICXXFLAGS)
|
||||
vtfilter_mpi_SOURCES = $(COMMONSOURCES)
|
||||
nodist_vtfilter_mpi_SOURCES = $(COMMONSOURCES)
|
||||
vtfilter_mpi_LDADD = $(COMMONLDADD) $(MPILIBDIR) $(MPILIB)
|
||||
vtfilter_mpi_DEPENDENCIES = $(COMMONDEPENDENCIES)
|
||||
|
||||
CLEANFILES = $(COMMONSOURCES)
|
||||
|
||||
|
||||
@ -14,19 +14,34 @@ CPPFLAGS = $(CPPFLAGS_FOR_BUILD)
|
||||
LDFLAGS = $(LDFLAGS_FOR_BUILD)
|
||||
LIBS = $(LIBS_FOR_BUILD)
|
||||
|
||||
# From Automake v2.0 the 'subdir-objects' option will be required to compile
|
||||
# sources located outside of the current build directory. Due to a bug in
|
||||
# Automake (see http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13928) we cannot
|
||||
# enable this option, so we have to sym link in the following sources (actually
|
||||
# located in $(top_srcdir)/util/) to lead Automake to believe that all sources
|
||||
# are located in this directory.
|
||||
UTILSOURCES = \
|
||||
installdirs.c \
|
||||
util.c
|
||||
|
||||
vtlibwrapgen_SOURCES = \
|
||||
vt_libwrapgen.h \
|
||||
vt_libwrapgen_filter.h \
|
||||
vt_libwrapgen_parser.h \
|
||||
vt_libwrapgen.cc \
|
||||
vt_libwrapgen_filter.cc \
|
||||
vt_libwrapgen_parser.cc \
|
||||
$(top_srcdir)/util/installdirs.c \
|
||||
$(top_srcdir)/util/util.c
|
||||
vt_libwrapgen_parser.cc
|
||||
|
||||
nodist_vtlibwrapgen_SOURCES = \
|
||||
vt_libwrapgen_defs.h
|
||||
$(UTILSOURCES)
|
||||
|
||||
vtlibwrapgen_LDADD = \
|
||||
$(CTOOLLIBDIR) $(CTOOLLIB)
|
||||
|
||||
# Sym link in util sources to keep the non-subdir-objects behavior
|
||||
$(UTILSOURCES):
|
||||
$(LN_S) $(top_srcdir)/util/$@
|
||||
|
||||
CLEANFILES = \
|
||||
$(UTILSOURCES)
|
||||
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
AUTOMAKE_OPTIONS = subdir-objects
|
||||
|
||||
if AMHAVEMPI
|
||||
SUBDIRS = . mpi
|
||||
endif
|
||||
@ -6,8 +8,7 @@ if AMBUILDBINARIES
|
||||
bin_PROGRAMS = vtunify
|
||||
endif
|
||||
|
||||
VTUNIFYSRCDIR = $(srcdir)
|
||||
include $(srcdir)/Makefile.common
|
||||
include Makefile.common
|
||||
|
||||
vtunify_CXXFLAGS = $(COMMONCXXFLAGS)
|
||||
vtunify_LDFLAGS = $(COMMONLDFLAGS)
|
||||
|
||||
@ -1,75 +1,7 @@
|
||||
#HOOKS1SOURCES = \
|
||||
# $(VTUNIFYSRCDIR)/hooks/vt_unify_hooks_raw.h \
|
||||
# $(VTUNIFYSRCDIR)/hooks/vt_unify_hooks_raw.cc
|
||||
#HOOKS1CXXFLAGS = -DVT_UNIFY_HOOKS_RAW
|
||||
#HOOKS1INCLUDE =
|
||||
#HOOKS1LIBRARY =
|
||||
#HOOKS1DEPENDENCIES =
|
||||
|
||||
HOOKS2SOURCES = \
|
||||
$(VTUNIFYSRCDIR)/hooks/vt_unify_hooks_aevents.h \
|
||||
$(VTUNIFYSRCDIR)/hooks/vt_unify_hooks_aevents.cc
|
||||
HOOKS2CXXFLAGS = -DVT_UNIFY_HOOKS_AEVENTS
|
||||
HOOKS2INCLUDE =
|
||||
HOOKS2LIBRARY =
|
||||
HOOKS2DEPENDENCIES =
|
||||
|
||||
HOOKS3SOURCES = \
|
||||
$(VTUNIFYSRCDIR)/hooks/vt_unify_hooks_margins.h \
|
||||
$(VTUNIFYSRCDIR)/hooks/vt_unify_hooks_margins.cc
|
||||
HOOKS3CXXFLAGS = -DVT_UNIFY_HOOKS_MARGINS
|
||||
HOOKS3INCLUDE =
|
||||
HOOKS3LIBRARY =
|
||||
HOOKS3DEPENDENCIES =
|
||||
|
||||
HOOKS4SOURCES = \
|
||||
$(VTUNIFYSRCDIR)/hooks/vt_unify_hooks_msgmatch_snaps.h \
|
||||
$(VTUNIFYSRCDIR)/hooks/vt_unify_hooks_msgmatch_snaps.cc
|
||||
HOOKS4CXXFLAGS = -DVT_UNIFY_HOOKS_MSGMATCH_SNAPS
|
||||
if AMEXTERNOTF
|
||||
HOOKS4INCLUDE =
|
||||
HOOKS4LIBRARY = $(OTFLIBDIR) -lotfaux
|
||||
HOOKS4DEPENDENCIES =
|
||||
else
|
||||
HOOKS4INCLUDE = -I$(top_srcdir)/extlib/otf/otfauxlib
|
||||
HOOKS4LIBRARY = $(top_builddir)/extlib/otf/otfauxlib/libotfaux.la
|
||||
HOOKS4DEPENDENCIES = $(HOOKS2LIBRARY)
|
||||
endif
|
||||
|
||||
HOOKS5SOURCES = \
|
||||
$(VTUNIFYSRCDIR)/hooks/vt_unify_hooks_prof.h \
|
||||
$(VTUNIFYSRCDIR)/hooks/vt_unify_hooks_prof.cc
|
||||
HOOKS5CXXFLAGS = -DVT_UNIFY_HOOKS_PROF
|
||||
HOOKS5INCLUDE =
|
||||
HOOKS5LIBRARY =
|
||||
HOOKS5DEPENDENCIES =
|
||||
|
||||
#HOOKS6SOURCES = \
|
||||
# $(VTUNIFYSRCDIR)/hooks/vt_unify_hooks_tdb.h \
|
||||
# $(VTUNIFYSRCDIR)/hooks/vt_unify_hooks_tdb.cc
|
||||
#HOOKS6CXXFLAGS = -DVT_UNIFY_HOOKS_TDB
|
||||
#HOOKS6INCLUDE =
|
||||
#HOOKS6LIBRARY =
|
||||
#HOOKS6DEPENDENCIES =
|
||||
|
||||
#HOOKS7SOURCES =
|
||||
#HOOKS7CXXFLAGS =
|
||||
#HOOKS7INCLUDE =
|
||||
#HOOKS7LIBRARY =
|
||||
#HOOKS7DEPENDENCIES =
|
||||
|
||||
HOOKSSOURCES = \
|
||||
$(VTUNIFYSRCDIR)/hooks/vt_unify_hooks_base.h \
|
||||
$(VTUNIFYSRCDIR)/hooks/vt_unify_hooks_base.cc \
|
||||
$(HOOKS1SOURCES) $(HOOKS2SOURCES) $(HOOKS3SOURCES) $(HOOKS4SOURCES) $(HOOKS5SOURCES) $(HOOKS6SOURCES)
|
||||
|
||||
HOOKSCXXFLAGS = $(HOOKS1CXXFLAGS) $(HOOKS2CXXFLAGS) $(HOOKS3CXXFLAGS) $(HOOKS4CXXFLAGS) $(HOOKS5CXXFLAGS) $(HOOKS6CXXFLAGS)
|
||||
HOOKSINCLUDE = $(HOOKS1INCLUDE) $(HOOKS2INCLUDE) $(HOOKS3INCLUDE) $(HOOKS4INCLUDE) $(HOOKS5INCLUDE) $(HOOKS6INCLUDE) $(HOOKS7INCLUDE)
|
||||
HOOKSLIBRARY = $(HOOKS1LIBRARY) $(HOOKS2LIBRARY) $(HOOKS3LIBRARY) $(HOOKS4LIBRARY) $(HOOKS5LIBRARY) $(HOOKS6LIBRARY) $(HOOKS7LIBRARY)
|
||||
HOOKSDEPENDENCIES = $(HOOKS1DEPENDENCIES) $(HOOKS2DEPENDENCIES) $(HOOKS3DEPENDENCIES) $(HOOKS4DEPENDENCIES) $(HOOKS5DEPENDENCIES) $(HOOKS6DEPENDENCIES) $(HOOKS7DEPENDENCIES)
|
||||
include $(top_srcdir)/tools/vtunify/Makefile.hooks
|
||||
|
||||
if AMBUILDETIMESYNC
|
||||
ETIMESYNCSOURCES = $(VTUNIFYSRCDIR)/vt_unify_esync.cc
|
||||
ETIMESYNCSOURCES = vt_unify_esync.cc
|
||||
ETIMESYNCCXXFLAGS = -DVT_ETIMESYNC
|
||||
ETIMESYNCINCLUDE = $(CLAPACKINCDIR)
|
||||
ETIMESYNCLIBRARY = $(CLAPACKLIBDIR) $(CLAPACKLIB)
|
||||
@ -90,35 +22,35 @@ OTFLIBRARY = $(top_builddir)/extlib/otf/otflib/libopen-trace-format.la
|
||||
OTFDEPENDENCIES = $(OTFLIBRARY)
|
||||
endif
|
||||
|
||||
AM_CPPFLAGS = -I$(VTUNIFYSRCDIR) $(OTFINCLUDE) $(HOOKSINCLUDE) $(ETIMESYNCINCLUDE) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/vtlib
|
||||
AM_CPPFLAGS = $(OTFINCLUDE) $(HOOKSINCLUDE) $(ETIMESYNCINCLUDE) -I$(top_srcdir)/tools/vtunify -I$(top_srcdir)/tools/vtunify/hooks -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/vtlib
|
||||
|
||||
COMMONSOURCES = \
|
||||
$(VTUNIFYSRCDIR)/vt_unify.h \
|
||||
$(VTUNIFYSRCDIR)/vt_unify_config.h \
|
||||
$(VTUNIFYSRCDIR)/vt_unify_defs.h \
|
||||
$(VTUNIFYSRCDIR)/vt_unify_defs_recs.h \
|
||||
$(VTUNIFYSRCDIR)/vt_unify_esync.h \
|
||||
$(VTUNIFYSRCDIR)/vt_unify_events_stats.h \
|
||||
$(VTUNIFYSRCDIR)/vt_unify_handlers.h \
|
||||
$(VTUNIFYSRCDIR)/vt_unify_hooks.h \
|
||||
$(VTUNIFYSRCDIR)/vt_unify_lvector.hh \
|
||||
$(VTUNIFYSRCDIR)/vt_unify_markers.h \
|
||||
$(VTUNIFYSRCDIR)/vt_unify_sync.h \
|
||||
$(VTUNIFYSRCDIR)/vt_unify_tkfac.h \
|
||||
$(VTUNIFYSRCDIR)/vt_unify_tkfac_scope.h \
|
||||
$(VTUNIFYSRCDIR)/vt_unify_tkfac_scope.hh \
|
||||
$(VTUNIFYSRCDIR)/vt_unify_usrcom.h \
|
||||
$(VTUNIFYSRCDIR)/vt_unify.cc \
|
||||
$(VTUNIFYSRCDIR)/vt_unify_defs.cc \
|
||||
$(VTUNIFYSRCDIR)/vt_unify_defs_recs.cc \
|
||||
vt_unify.h \
|
||||
vt_unify_config.h \
|
||||
vt_unify_defs.h \
|
||||
vt_unify_defs_recs.h \
|
||||
vt_unify_esync.h \
|
||||
vt_unify_events_stats.h \
|
||||
vt_unify_handlers.h \
|
||||
vt_unify_hooks.h \
|
||||
vt_unify_lvector.hh \
|
||||
vt_unify_markers.h \
|
||||
vt_unify_sync.h \
|
||||
vt_unify_tkfac.h \
|
||||
vt_unify_tkfac_scope.h \
|
||||
vt_unify_tkfac_scope.hh \
|
||||
vt_unify_usrcom.h \
|
||||
vt_unify.cc \
|
||||
vt_unify_defs.cc \
|
||||
vt_unify_defs_recs.cc \
|
||||
$(ETIMESYNCSOURCES) \
|
||||
$(VTUNIFYSRCDIR)/vt_unify_events_stats.cc \
|
||||
$(VTUNIFYSRCDIR)/vt_unify_handlers.cc \
|
||||
$(VTUNIFYSRCDIR)/vt_unify_hooks.cc \
|
||||
$(VTUNIFYSRCDIR)/vt_unify_markers.cc \
|
||||
$(VTUNIFYSRCDIR)/vt_unify_sync.cc \
|
||||
$(VTUNIFYSRCDIR)/vt_unify_tkfac.cc \
|
||||
$(VTUNIFYSRCDIR)/vt_unify_usrcom.cc \
|
||||
vt_unify_events_stats.cc \
|
||||
vt_unify_handlers.cc \
|
||||
vt_unify_hooks.cc \
|
||||
vt_unify_markers.cc \
|
||||
vt_unify_sync.cc \
|
||||
vt_unify_tkfac.cc \
|
||||
vt_unify_usrcom.cc \
|
||||
$(HOOKSSOURCES)
|
||||
|
||||
if AMHAVEOMP
|
||||
|
||||
69
ompi/contrib/vt/vt/tools/vtunify/Makefile.hooks
Обычный файл
69
ompi/contrib/vt/vt/tools/vtunify/Makefile.hooks
Обычный файл
@ -0,0 +1,69 @@
|
||||
#HOOKS1SOURCES = \
|
||||
# hooks/vt_unify_hooks_raw.h \
|
||||
# hooks/vt_unify_hooks_raw.cc
|
||||
#HOOKS1CXXFLAGS = -DVT_UNIFY_HOOKS_RAW
|
||||
#HOOKS1INCLUDE =
|
||||
#HOOKS1LIBRARY =
|
||||
#HOOKS1DEPENDENCIES =
|
||||
|
||||
HOOKS2SOURCES = \
|
||||
hooks/vt_unify_hooks_aevents.h \
|
||||
hooks/vt_unify_hooks_aevents.cc
|
||||
HOOKS2CXXFLAGS = -DVT_UNIFY_HOOKS_AEVENTS
|
||||
HOOKS2INCLUDE =
|
||||
HOOKS2LIBRARY =
|
||||
HOOKS2DEPENDENCIES =
|
||||
|
||||
HOOKS3SOURCES = \
|
||||
hooks/vt_unify_hooks_margins.h \
|
||||
hooks/vt_unify_hooks_margins.cc
|
||||
HOOKS3CXXFLAGS = -DVT_UNIFY_HOOKS_MARGINS
|
||||
HOOKS3INCLUDE =
|
||||
HOOKS3LIBRARY =
|
||||
HOOKS3DEPENDENCIES =
|
||||
|
||||
HOOKS4SOURCES = \
|
||||
hooks/vt_unify_hooks_msgmatch_snaps.h \
|
||||
hooks/vt_unify_hooks_msgmatch_snaps.cc
|
||||
HOOKS4CXXFLAGS = -DVT_UNIFY_HOOKS_MSGMATCH_SNAPS
|
||||
if AMEXTERNOTF
|
||||
HOOKS4INCLUDE =
|
||||
HOOKS4LIBRARY = $(OTFLIBDIR) -lotfaux
|
||||
HOOKS4DEPENDENCIES =
|
||||
else
|
||||
HOOKS4INCLUDE = -I$(top_srcdir)/extlib/otf/otfauxlib
|
||||
HOOKS4LIBRARY = $(top_builddir)/extlib/otf/otfauxlib/libotfaux.la
|
||||
HOOKS4DEPENDENCIES = $(HOOKS2LIBRARY)
|
||||
endif
|
||||
|
||||
HOOKS5SOURCES = \
|
||||
hooks/vt_unify_hooks_prof.h \
|
||||
hooks/vt_unify_hooks_prof.cc
|
||||
HOOKS5CXXFLAGS = -DVT_UNIFY_HOOKS_PROF
|
||||
HOOKS5INCLUDE =
|
||||
HOOKS5LIBRARY =
|
||||
HOOKS5DEPENDENCIES =
|
||||
|
||||
#HOOKS6SOURCES = \
|
||||
# hooks/vt_unify_hooks_tdb.h \
|
||||
# hooks/vt_unify_hooks_tdb.cc
|
||||
#HOOKS6CXXFLAGS = -DVT_UNIFY_HOOKS_TDB
|
||||
#HOOKS6INCLUDE =
|
||||
#HOOKS6LIBRARY =
|
||||
#HOOKS6DEPENDENCIES =
|
||||
|
||||
#HOOKS7SOURCES =
|
||||
#HOOKS7CXXFLAGS =
|
||||
#HOOKS7INCLUDE =
|
||||
#HOOKS7LIBRARY =
|
||||
#HOOKS7DEPENDENCIES =
|
||||
|
||||
HOOKSSOURCES = \
|
||||
hooks/vt_unify_hooks_base.h \
|
||||
hooks/vt_unify_hooks_base.cc \
|
||||
$(HOOKS1SOURCES) $(HOOKS2SOURCES) $(HOOKS3SOURCES) $(HOOKS4SOURCES) $(HOOKS5SOURCES) $(HOOKS6SOURCES)
|
||||
|
||||
HOOKSCXXFLAGS = $(HOOKS1CXXFLAGS) $(HOOKS2CXXFLAGS) $(HOOKS3CXXFLAGS) $(HOOKS4CXXFLAGS) $(HOOKS5CXXFLAGS) $(HOOKS6CXXFLAGS)
|
||||
HOOKSINCLUDE = $(HOOKS1INCLUDE) $(HOOKS2INCLUDE) $(HOOKS3INCLUDE) $(HOOKS4INCLUDE) $(HOOKS5INCLUDE) $(HOOKS6INCLUDE) $(HOOKS7INCLUDE)
|
||||
HOOKSLIBRARY = $(HOOKS1LIBRARY) $(HOOKS2LIBRARY) $(HOOKS3LIBRARY) $(HOOKS4LIBRARY) $(HOOKS5LIBRARY) $(HOOKS6LIBRARY) $(HOOKS7LIBRARY)
|
||||
HOOKSDEPENDENCIES = $(HOOKS1DEPENDENCIES) $(HOOKS2DEPENDENCIES) $(HOOKS3DEPENDENCIES) $(HOOKS4DEPENDENCIES) $(HOOKS5DEPENDENCIES) $(HOOKS6DEPENDENCIES) $(HOOKS7DEPENDENCIES)
|
||||
@ -1,3 +1,5 @@
|
||||
AUTOMAKE_OPTIONS = subdir-objects
|
||||
|
||||
if AMBUILDBINARIES
|
||||
bin_PROGRAMS = vtunify-mpi
|
||||
endif
|
||||
@ -6,8 +8,10 @@ if AMBUILDMPIUNIFYLIB
|
||||
lib_LTLIBRARIES = libvt-mpi-unify.la
|
||||
endif
|
||||
|
||||
VTUNIFYSRCDIR = $(srcdir)/..
|
||||
include $(srcdir)/../Makefile.common
|
||||
include ../Makefile.common
|
||||
|
||||
$(COMMONSOURCES):
|
||||
$(LN_S) $(abs_top_srcdir)/tools/vtunify/$@ $@
|
||||
|
||||
CC = $(MPICC)
|
||||
CXX = $(MPICXX)
|
||||
@ -17,10 +21,12 @@ vtunify_mpi_CXXFLAGS = $(COMMONCXXFLAGS) -DVT_MPI $(MPICXXFLAGS) $(MPIINCDIR)
|
||||
vtunify_mpi_LDFLAGS = $(COMMONLDFLAGS) $(MPICXXFLAGS)
|
||||
|
||||
vtunify_mpi_SOURCES = \
|
||||
$(COMMONSOURCES) \
|
||||
vt_unify_lib.h \
|
||||
vt_unify_mpi.h
|
||||
|
||||
nodist_vtunify_mpi_SOURCES = \
|
||||
$(COMMONSOURCES)
|
||||
|
||||
vtunify_mpi_LDADD = \
|
||||
$(COMMONLDADD) \
|
||||
$(MPILIBDIR) $(MPILIB)
|
||||
@ -32,6 +38,9 @@ libvt_mpi_unify_la_CFLAGS = -DVT_LIB $(vtunify_mpi_CFLAGS)
|
||||
libvt_mpi_unify_la_CXXFLAGS = -DVT_LIB -DVT_MPI $(HOOKSCXXFLAGS) $(ETIMESYNCCXXFLAGS) $(MPICXXFLAGS) $(MPIINCDIR)
|
||||
libvt_mpi_unify_la_LDFLAGS = $(MPICXXFLAGS)
|
||||
libvt_mpi_unify_la_SOURCES = $(vtunify_mpi_SOURCES)
|
||||
nodist_libvt_mpi_unify_la_SOURCES = $(nodist_vtunify_mpi_SOURCES)
|
||||
libvt_mpi_unify_la_LIBADD = $(COMMONLDADD) $(MPILIBDIR) $(PMPILIB)
|
||||
libvt_mpi_unify_la_DEPENDENCIES = $(vtunify_mpi_DEPENDENCIES)
|
||||
|
||||
CLEANFILES = $(COMMONSOURCES)
|
||||
|
||||
|
||||
@ -165,10 +165,21 @@ CPPFLAGS = $(CPPFLAGS_FOR_BUILD)
|
||||
LDFLAGS = $(LDFLAGS_FOR_BUILD)
|
||||
LIBS = $(LIBS_FOR_BUILD)
|
||||
|
||||
# From Automake v2.0 the 'subdir-objects' option will be required to compile
|
||||
# sources located outside of the current build directory. Due to a bug in
|
||||
# Automake (see http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13928) we cannot
|
||||
# enable this option, so we have to sym link in the following sources (actually
|
||||
# located in $(top_srcdir)/util/) to lead Automake to believe that all sources
|
||||
# are located in this directory.
|
||||
UTILSOURCES = \
|
||||
installdirs.c \
|
||||
util.c
|
||||
|
||||
@CROSS_PREFIX@vtwrapper_SOURCES = \
|
||||
vt_wrapper.cc \
|
||||
$(top_srcdir)/util/installdirs.c \
|
||||
$(top_srcdir)/util/util.c
|
||||
vt_wrapper.cc
|
||||
|
||||
nodist_@CROSS_PREFIX@vtwrapper_SOURCES = \
|
||||
$(UTILSOURCES)
|
||||
|
||||
@CROSS_PREFIX@vtwrapper_CXXFLAGS = \
|
||||
$(HAVEFCCXXFLAGS) \
|
||||
@ -177,7 +188,12 @@ LIBS = $(LIBS_FOR_BUILD)
|
||||
$(HAVETHREADSCXXFLAGS) \
|
||||
$(HAVEOMPCXXFLAGS)
|
||||
|
||||
CLEANFILES = $(CROSSPREFIXCLEANFILES)
|
||||
$(UTILSOURCES):
|
||||
$(LN_S) $(top_srcdir)/util/$@
|
||||
|
||||
CLEANFILES = \
|
||||
$(CROSSPREFIXCLEANFILES) \
|
||||
$(UTILSOURCES)
|
||||
|
||||
EXTRA_DIST = \
|
||||
fake_omp.h \
|
||||
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user