From dd6bbada96a3e481660eb4ae25a5146eab6292ac Mon Sep 17 00:00:00 2001 From: Aart Stuurman Date: Fri, 26 Jan 2018 23:04:01 +0100 Subject: [PATCH] Fix build error for Make where include files could not be found. Make now installs headers correctly. --- Makefile | 6 ++++-- src/Makefile | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9f1fe75..9af8712 100644 --- a/Makefile +++ b/Makefile @@ -25,9 +25,11 @@ clean: install: mkdir -p ${INCLUDE_DIR}/$(LIBRARY_NAME) + mkdir -p ${INCLUDE_DIR}/$(LIBRARY_NAME)/linux_tcp mkdir -p ${LIBRARY_DIR} - cp -f $(LIBRARY_NAME).h ${INCLUDE_DIR} - cp -f include/*.h ${INCLUDE_DIR}/$(LIBRARY_NAME) + cp -f include/$(LIBRARY_NAME).h ${INCLUDE_DIR} + cp -f include/amqpcpp/*.h ${INCLUDE_DIR}/$(LIBRARY_NAME) + cp -f include/amqpcpp/linux_tcp/*.h ${INCLUDE_DIR}/$(LIBRARY_NAME)/linux_tcp -cp -f src/lib$(LIBRARY_NAME).so.$(VERSION) ${LIBRARY_DIR} -cp -f src/lib$(LIBRARY_NAME).a.$(VERSION) ${LIBRARY_DIR} ln -r -s -f $(LIBRARY_DIR)/lib$(LIBRARY_NAME).so.$(VERSION) $(LIBRARY_DIR)/lib$(LIBRARY_NAME).so.$(SONAME) diff --git a/src/Makefile b/src/Makefile index a05ea7a..3471fd5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,6 +1,6 @@ CPP = g++ RM = rm -f -CPPFLAGS = -Wall -c -I. -std=c++11 -MD +CPPFLAGS = -Wall -c -I../include -std=c++11 -MD LD = g++ LD_FLAGS = -Wall -shared SHARED_LIB = lib$(LIBRARY_NAME).so.$(VERSION)