diff --git a/DriverInterface/InterfaceLib/inc/ecs.h b/DriverInterface/pcie40/ecs.h similarity index 100% rename from DriverInterface/InterfaceLib/inc/ecs.h rename to DriverInterface/pcie40/ecs.h diff --git a/Lib/.gitignore b/Lib/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..d07f0abdaa7a96ac55784bbd24ed14a4ad9ab9b4 --- /dev/null +++ b/Lib/.gitignore @@ -0,0 +1,2 @@ +lib/ +obj/ diff --git a/Lib/Makefile b/Lib/Makefile index 07ce334e415f393302c1518e9df265dc7fd00d95..31f4bd4d75d1a9640d3fe3c311a4bd0cc95b48e6 100644 --- a/Lib/Makefile +++ b/Lib/Makefile @@ -4,7 +4,7 @@ CFLAGS= -c -Wall LDFLAGS= #defined global variables and programs to build -include ../conf/Makefile +include Makefile.conf #Globals Directories @@ -20,6 +20,8 @@ include ../conf/Makefile #PCIE40_DYN_LIB=/usr/lib64 #PCIE40_STAT_LIB=/usr/lib64 +PCIE40_INC_DIR=../DriverInterface + OBJ_DIR=obj/ SRC_DIR=src/ INC_DIR=inc/ @@ -64,10 +66,12 @@ all: $(ECS_OBJ) $(ECS_LIB) $(MINIPODS_OBJ) $(MINIPODS_LIB) $(LTC2990_OBJ) $(LTC2 $(ECS_OBJ): $(OBJ_DIR)%.o : $(SRC_DIR)$(ECS_DIR)%.c @echo "Construction of ecs objects $@ from $<" + mkdir -p obj $(CC) $(CFLAGS) -I $(INC_DIR)$(ECS_DIR) -I $(INC_DIR)$(SYSTEM_DIR) -I $(PCIE40_INC_DIR) $< -o $@ $(ECS_LIB) : $(ECS_OBJ) @echo "Construction of ECS Library" + mkdir -p lib ar -q $(LIB_DIR)$(ECS_LIB) $(ECS_OBJ) @echo "" diff --git a/Lib/src/ecs/ecs.c b/Lib/src/ecs/ecs.c index 32808657405c8456fb5d18081ac64cddf3f1bc74..0ec6d54e1fb81e924d481c53207fe0d91c45209e 100644 --- a/Lib/src/ecs/ecs.c +++ b/Lib/src/ecs/ecs.c @@ -46,7 +46,7 @@ ecs_closeUser() ecs_closeLli() // rpm includes // PYD 20/03/2018 force the use of rpm for all borads types -#include <lhcb/pcie40/ecs.h> +#include <pcie40/ecs.h> /** * \var ecs_userFile