From 13a54224eb42341fbfa8797d0cd9d6e953af60e9 Mon Sep 17 00:00:00 2001 From: Leonardo Sala Date: Fri, 12 Sep 2014 16:22:22 +0200 Subject: [PATCH] updating makefiles --- slsDetectorGui/Makefile | 8 ++++++++ slsDetectorGui/client/Makefile | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/slsDetectorGui/Makefile b/slsDetectorGui/Makefile index fbbdeee59..26b0c4318 100644 --- a/slsDetectorGui/Makefile +++ b/slsDetectorGui/Makefile @@ -2,6 +2,14 @@ include ../Makefile.include +$(info ) +$(info ##################################) +$(info # Compiling slsDetectorGui #) +$(info ##################################) +$(info ) + + + PROG = $(DESTDIR)/slsDetectorGui DESTDIR ?= ../bin diff --git a/slsDetectorGui/client/Makefile b/slsDetectorGui/client/Makefile index ca48957a2..2b86b2a9c 100644 --- a/slsDetectorGui/client/Makefile +++ b/slsDetectorGui/client/Makefile @@ -4,8 +4,9 @@ LDLIBS += -lm -lstdc++ -lpthread LDIR = ../../slsDetectorSoftware RDIR = ../../slsReceiverSoftware -INCLUDES = -I $(LDIR)/commonFiles -I $(RDIR)/MySocketTCP -I $(LDIR)/slsDetector -I ../include -I $(RDIR)/includes -SRC_CLNT = qClient.cpp $(RDIR)/MySocketTCP/MySocketTCP.cpp +INCLUDES = -I $(LDIR)/commonFiles -I $(LDIR)/slsDetector -I ../include -I $(RDIR)/include +SRC_CLNT = qClient.cpp $(RDIR)/src/MySocketTCP.cpp + PROGS = gui_client DESTDIR ?= bin