ordered the makefile a bit, needs more revising

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@189 af1100a4-978c-4157-bff7-07162d2ba061

slsDetectorGui/Makefile

@@ -8,6 +8,7 @@ LIBRARYDIR?=../slsDetectorSoftware
 INCLUDES?= $(LIBRARYDIR)/commonFiles -I$(LIBRARYDIR)/MySocketTCP  -I$(LIBRARYDIR)/slsReceiverInterface   -I$(LIBRARYDIR)/slsDetector  -I$(LIBRARYDIR)/slsDetectorAnalysis  -I$(LIBRARYDIR)/multiSlsDetector   -I$(LIBRARYDIR)/usersFunctions  
 LDFLAG?=-L$(LIBRARYDIR)/bin -lSlsDetector 
 
+
 all: $(PROG) Makefile.gui guiclient
 
 clean: 
@@ -19,7 +20,7 @@ clean:
 Makefile.gui: mm
 
 mm:
-	qmake -set QT_INSTALL_PREFIX $(QTDIR) && qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR) SLSDETLIB=$(LIBDIR) SUBLIBS='$(LDFLAG)' INCLUDES='$(INCLUDES)' 
+	qmake -set QT_INSTALL_PREFIX $(QTDIR) && qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR) SLSDETLIB=$(LIBDIR) SUBLIBS='$(LDFLAG)'
 
 doc:
 	cd manual && make DESTDIR=$(DOCDIR)

slsDetectorGui/slsDetectorGui.pro

@@ -1,27 +1,43 @@
+#When using yum for qt, comment out all lines with $(QTDIR) or $(QWTDIR), but export QWTDIR = /usr/include/qwt/ 
+#and leave 	"$(QWTDIR) \"uncommented in the INCLUDEPATH
 
-QT_INSTALL_PREFIX=$(QTDIR)
+#When using epics, uncomment epics defines, libs and a line in INCLUDEPATH
-QMAKE_UIC = $(QTDIR)/bin/uic
+
-QMAKE_MOC =  $(QTDIR)/bin/moc
+
-QMAKE_RCC =  $(QTDIR)/bin/rcc
+QT_INSTALL_PREFIX	=	$(QTDIR)
-QMAKE_INCDIR_QT = $(QTDIR)/include/
+QMAKE_UIC 			= 	$(QTDIR)/bin/uic
+QMAKE_MOC 			=  	$(QTDIR)/bin/moc
+QMAKE_RCC 			=  	$(QTDIR)/bin/rcc
+QMAKE_INCDIR_QT 	= 	$(QTDIR)/include/
+QMAKE_LIBS_QT 		= 	-L$(QTDIR)/lib 
+QMAKE_LIBS 			= 	-L$(QTDIR)/lib 
+
+
+
+
+#epics
+#DEFINES 			+= 	 EPICS	VERBOSE DACS_INT PRINT_LOG THIS_PATH=\\\"$$PWD\\\" #VERYVERBOSE 
+#LIBS				=	-L$(QWTDIR)/lib	  -lqwt -L$(QWT3D)/lib -Wl,-R$(QWTDIR)/lib  -L /usr/local/epics/base/lib/$(EPICS_HOST_ARCH)/ -Wl,-R/usr/local/epics/base/lib/$(EPICS_HOST_ARCH)  -lca -lCom 
+
+#default
+DEFINES 			+= 	 VERBOSE DACS_INT PRINT_LOG THIS_PATH=\\\"$$PWD\\\" #VERYVERBOSE 
+LIBS				=	-L$(QWTDIR)/lib	  -lqwt -L$(QWT3D)/lib 
+
+
+
+
+QMAKE_CXXFLAGS_WARN_ON = 	-w 
+QMAKE_CFLAGS_WARN_ON   = 	-w
 
-QMAKE_LIBS_QT = 	-L$(QTDIR)/lib 
-QMAKE_LIBS = 	-L$(QTDIR)/lib 
 
 DESTDIR  			?= 		bin
 MOC_DIR   			= 		mocs
 OBJECTS_DIR 		= 		objs
 UI_HEADERS_DIR		= 		forms/include
-SLSDETLIB ?=../slsDetectorSoftware               
+SLSDETLIB 			?=		../slsDetectorSoftware               
 RESOURCES   		+=  	icons.qrc
-
 CONFIG				+=		debug no_include_pwd
 
-QMAKE_CXXFLAGS_WARN_ON = 	-w 
-QMAKE_CFLAGS_WARN_ON   = 	-w
-
-DEFINES 			+= 	 VERBOSE DACS_INT PRINT_LOG THIS_PATH=\\\"$$PWD\\\" #VERYVERBOSE 
-#DEFINES 			+= 	 EPICS	VERBOSE DACS_INT PRINT_LOG THIS_PATH=\\\"$$PWD\\\" #VERYVERBOSE 
 						
 
 target.path 		+= 		$(DESTDIR)
@@ -33,19 +49,13 @@ QMAKE_CLEAN 		+= 		docs/*/*
 							
 
 
-#LIBS				+=		-Wl,-Bstatic -L../slsDetectorSoftware -lSlsDetector  -Wl,-Bdynamic\
-#							-L$(QWTDIR)/lib  -lqwt -L$(QWT3D)/lib 
- 
- 
-LIBS				=	-L$(QWTDIR)/lib	  -lqwt -L$(QWT3D)/lib 
-#LIBS				=	-L$(QWTDIR)/lib	  -lqwt -L$(QWT3D)/lib -Wl,-R$(QWTDIR)/lib  -L /usr/local/epics/base/lib/$(EPICS_HOST_ARCH)/ -Wl,-R/usr/local/epics/base/lib/$(EPICS_HOST_ARCH)  -lca -lCom 
-
 
 DEPENDPATH  		+=		\
 							slsDetectorPlotting/include\
 							include\
 							forms/include
 
+
 INCLUDEPATH 		= 	\	 
 							$(QWTDIR)/include\
 							$(QWTDIR) \
@@ -55,9 +65,14 @@ INCLUDEPATH 		= 	\
 							include\
 							forms/include\
 							$(INCLUDES)
+#epics
 #                            $(INCLUDES) /usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/
 
 
+
+
+
+
 SOURCES 			= 		\
 							slsDetectorPlotting/src/SlsQt1DPlot.cxx\
 							slsDetectorPlotting/src/SlsQt1DZoomer.cxx\