Commit b890abb3 authored by Yuelong Yu's avatar Yuelong Yu
Browse files

changed include path of libagipd and changed make file so it uses the agipd.pc

parent fddefba6
...@@ -32,7 +32,7 @@ static const char *RcsId = "$Id: $"; ...@@ -32,7 +32,7 @@ static const char *RcsId = "$Id: $";
#include <AGIPD.h> #include <AGIPD.h>
#include <AGIPDClass.h> #include <AGIPDClass.h>
#include <AGIPDImpl.h> #include <fsdetector/agipd/AGIPDImpl.h>
#include <AcquisitionThread.h> #include <AcquisitionThread.h>
#include <DetectorSimulation.h> #include <DetectorSimulation.h>
/*----- PROTECTED REGION END -----*/ // AGIPD.cpp /*----- PROTECTED REGION END -----*/ // AGIPD.cpp
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <tango.h> #include <tango.h>
#include<sys/stat.h> #include<sys/stat.h>
#include <AGIPDInterface.h> #include <fsdetector/agipd/AGIPDInterface.h>
#include <exception> #include <exception>
#include "circularFifo.h" #include "circularFifo.h"
...@@ -48,7 +48,7 @@ namespace AGIPD_ns ...@@ -48,7 +48,7 @@ namespace AGIPD_ns
/*----- PROTECTED REGION ID(AGIPD::Additional Class Declarations) ENABLED START -----*/ /*----- PROTECTED REGION ID(AGIPD::Additional Class Declarations) ENABLED START -----*/
// Additional Class Declarations // Additional Class Declarations
using namespace DetCommonNS; using namespace DetAGIPDNS;
using namespace std; using namespace std;
/*----- PROTECTED REGION END -----*/ // AGIPD::Additional Class Declarations /*----- PROTECTED REGION END -----*/ // AGIPD::Additional Class Declarations
......
...@@ -665,7 +665,7 @@ namespace AGIPD_ns ...@@ -665,7 +665,7 @@ namespace AGIPD_ns
omni_mutex& m_mutexAcq; omni_mutex& m_mutexAcq;
long m_lRequestFrameNo; long m_lRequestFrameNo;
long m_lCurrentFrameNo; int m_lCurrentFrameNo;
short m_shFrameErrorCode; short m_shFrameErrorCode;
short* m_ptrShData; short* m_ptrShData;
......
...@@ -29,6 +29,9 @@ LIB_PNIIO_CONFIG = $(shell pkg-config --libs pniio) ...@@ -29,6 +29,9 @@ LIB_PNIIO_CONFIG = $(shell pkg-config --libs pniio)
CPPFLAGS_PNIIO_CONFIG = $(shell pkg-config --cflags pniio) CPPFLAGS_PNIIO_CONFIG = $(shell pkg-config --cflags pniio)
LIBS_AGIPD_CONFIG = $(shell pkg-config --libs agipd)
CPPFLAGS_AGIPD_CONFIG = $(shell pkg-config --cflags agipd)
# ifndef _ARCH # ifndef _ARCH
# _ARCH = $(shell uname -m) # _ARCH = $(shell uname -m)
# endif # endif
...@@ -42,13 +45,13 @@ libdir = lib ...@@ -42,13 +45,13 @@ libdir = lib
INC_DIR_USER= -I/usr/include/tango \ INC_DIR_USER= -I/usr/include/tango \
-I/usr/include \ -I/usr/include \
-I. \ -I.
-I../../bin/usr/include/agipd
LIB_DIR_USER= -L /usr/$(libdir) -L../../bin/usr/lib LIB_DIR_USER= -L /usr/$(libdir)
LFLAGS_USR= $(RELEASE_TYPE) -Wall $(LIB_DIR_USER) \ LFLAGS_USR= $(RELEASE_TYPE) -Wall $(LIB_DIR_USER) \
$(LIB_PNIIO_CONFIG) \ $(LIB_PNIIO_CONFIG) \
$(LIBS_AGIPD_CONFIG) \
-ltango \ -ltango \
-llog4tango \ -llog4tango \
-lCOS4\ -lCOS4\
...@@ -58,7 +61,6 @@ $(LIB_PNIIO_CONFIG) \ ...@@ -58,7 +61,6 @@ $(LIB_PNIIO_CONFIG) \
-ldl \ -ldl \
-lpthread \ -lpthread \
-lstdc++ \ -lstdc++ \
-lagipd \
-lhdf5_hl -lhdf5_hl
...@@ -67,7 +69,7 @@ $(LIB_PNIIO_CONFIG) \ ...@@ -67,7 +69,7 @@ $(LIB_PNIIO_CONFIG) \
$(CPPFLAGS_PNIIO_CONFIG) $(INC_DIR_USER) $(CPPFLAGS_PNIIO_CONFIG) $(INC_DIR_USER)
CXXFLAGS_USR =-O3 -std=c++11 -Wall $(RELEASE_TYPE) -D_REENTRANT \ CXXFLAGS_USR =-O3 -std=c++11 -Wall $(RELEASE_TYPE) -D_REENTRANT \
$(CPPFLAGS_PNIIO_CONFIG) $(INC_DIR_USER) $(CPPFLAGS_PNIIO_CONFIG) $(INC_DIR_USER) $(CPPFLAGS_AGIPD_CONFIG)
SVC_INC = $(PACKAGE_NAME).h $(PACKAGE_NAME)Class.h \ SVC_INC = $(PACKAGE_NAME).h $(PACKAGE_NAME)Class.h \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment