Merged in zaher-salman/musrfit (pull request #4)

Compilation errors distclean issues

configure.ac

@@ -1167,6 +1167,8 @@ AC_CONFIG_FILES([Makefile \
                  src/external/libPhotoMeissner/Makefile \
                  src/external/libPhotoMeissner/classes/Makefile \
                  src/external/libBNMR/Makefile \
+                 src/musredit/Makefile \
+                 src/musrgui/Makefile \
                  src/musredit/musredit_startup.xml \
                  src/musrgui/musrgui_startup.xml])
 

src/Makefile.am

@@ -22,15 +22,17 @@ SUBDIRS = external/MusrRoot \
           external/mud \
           $(PNEXUSDIRS) \
           classes \
-          external
+          external \
+          musredit \
+          musrgui 
 
 if BUILD_MUSRGUI
-SUBDIRS += $(EDITORDIR)
+#SUBDIRS += $(EDITORDIR)
 EXTRA_DIST = $(EDITORDIR)/Makefile
 endif
 
 if BUILD_MUSREDIT
-SUBDIRS += $(EDITORDIR)
+#SUBDIRS += $(EDITORDIR)
 EXTRA_DIST = $(EDITORDIR)/Makefile
 endif
 

src/include/PMusr.h

@@ -36,6 +36,12 @@ using namespace std;
 
 #include <TString.h>
 
+// the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower
+#ifdef __CINT__
+typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
+#endif
+#include "fftw3.h"
+
 #define PMUSR_SUCCESS                   0
 #define PMUSR_WRONG_STARTUP_SYNTAX     -1
 #define PMUSR_MSR_FILE_NOT_FOUND       -2

src/musredit/Makefile.am

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

src/musrgui/Makefile.am

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