LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 4 Activity

merge master into root6

Browse Source
This commit is contained in:
suter_a
2015-10-27 14:34:33 +01:00
parent 8aed37a793 6433585d3b
commit 53a18397c9
4 changed files with 105 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Makefile.am
View File

@ -16,6 +16,10 @@ if BUILD_MUSREDIT
EDITORDIR = musredit
endif
if BUILD_MUSREDIT_QT5
EDITORDIR = musredit_qt5
endif
SUBDIRS = external/MusrRoot \
external/TLemRunHeader \
external/MuSR_software \
@ -23,6 +27,7 @@ SUBDIRS = external/MusrRoot \
$(PNEXUSDIRS) \
classes \
external \
musredit_qt5 \
musredit \
musrgui
@ -36,6 +41,10 @@ if BUILD_MUSREDIT
EXTRA_DIST = $(EDITORDIR)/Makefile
endif
if BUILD_MUSREDIT_QT5
EXTRA_DIST = $(EDITORDIR)/Makefile
endif
bin_PROGRAMS = musrfit musrview musrt0 musrFT msr2msr msr2data any2many
bin_PROGRAMS += write_musrRoot_runHeader musrRootValidation
bin_PROGRAMS += dump_header

2
src/musredit/Makefile.am
View File

@ -1,5 +1,5 @@
## Process this file with automake to create Makefile.in
CLEANFILES = *~ core
CLEANFILES = *~ core moc_* ui_*

3
src/musredit_qt5/Makefile.am
View File

@ -1,5 +1,4 @@
## Process this file with automake to create Makefile.in
CLEANFILES = *~ core
CLEANFILES = *~ core moc_* ui_*