From dc36f79660dd9b6bdf48f77feed12309ae0af10a Mon Sep 17 00:00:00 2001
From: Anjan Chanda <anjan.chanda@iopsys.eu>
Date: Thu, 23 Mar 2023 11:28:53 +0100
Subject: [PATCH] fix Makefiles

---
 Makefile     | 21 +++++++++------------
 Makefile.inc | 27 +++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 12 deletions(-)
 create mode 100644 Makefile.inc

diff --git a/Makefile b/Makefile
index 8bc1818..8d4da63 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,9 @@
-CC = gcc
+CC ?= gcc
+PLATFORM ?= TEST
 
--include ../Makefile.diag.inc
-CFLAGS = -O2 -g $(DIAG_CFLAGS) -Werror
+CFLAGS = -O2 -g -Werror
 
-LIBETH_CFLAGS += -I. -I../libeasy
-LIBETH_LDFLAGS += -L../libeasy
+LIBETH_CFLAGS += -I.
 LIBS += -lnl-3 -lnl-route-3 -lnl-genl-3
 LIBS += -leasy
 
@@ -15,14 +14,12 @@ objs_lib += bcm/bcm.o
 endif
 
 ifeq ($(PLATFORM),TEST)
-CFLAGS += -DIOPSYS_TEST -I/usr/include/libnl3
-LIBETH_CFLAGS += $(DIAG_CFLAGS) -Werror
+CFLAGS += -DIOPSYS_TEST $(LIBETH_CFLAGS) -I/usr/include/libnl3
 objs_lib += test_stub/stub.o
 endif
 
 ifeq ($(PLATFORM),ECONET)
-CFLAGS += -Itest_stub
-LIBETH_CFLAGS += $(DIAG_CFLAGS) -Werror
+CFLAGS += -Itest_stub $(LIBETH_CFLAGS)
 objs_lib += econet/econet.o econet/ecnt_prvt.o
 LIBS += -lapi_lib_switchmgr
 endif
@@ -38,11 +35,11 @@ endif
 all: libethernet.so
 
 %.o: %.c
-	$(CC) $(CFLAGS) $(LIBETH_CFLAGS) -fPIC -c -o $@ $<
+	$(CC) $(CFLAGS) -fPIC -c -o $@ $<
 
 libethernet.so: $(objs_lib)
-	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) $(LIBETH_LDFLAGS) \
-		-shared -o $@ $^ $(XXFLAGS) $(LIBS)
+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) \
+		-shared -o $@ $^ $(LIBS)
 
 clean:
 	rm -f *.o *.so
diff --git a/Makefile.inc b/Makefile.inc
new file mode 100644
index 0000000..48308a8
--- /dev/null
+++ b/Makefile.inc
@@ -0,0 +1,27 @@
+CP ?= cp -fpPR
+INSTALL ?= install
+INSTALL_DIR = $(INSTALL) -d -m 755
+INSTALL_PROGRAM = $(INSTALL) -m 755
+INSTALL_DATA = $(INSTALL) -m 644
+INSTALL_CONF = $(INSTALL) -m 600
+INSTALL_LIB = $(CP)
+
+INCDIR ?= /usr/include
+LIBDIR ?= /usr/lib
+
+
+header-files ?= $(wildcard *.h)
+library-files ?= $(wildcard *.so*)
+
+
+$(DESTDIR)/$(INCDIR)/%: %
+	$(INSTALL_DATA) -D $< $@
+
+$(DESTDIR)/$(LIBDIR)/%: %
+	$(INSTALL_DIR) $(DESTDIR)/$(LIBDIR)
+	$(INSTALL_LIB) $< $@
+
+
+install-headers: $(addprefix $(DESTDIR)/$(INCDIR)/,$(header-files))
+
+install-libs: $(addprefix $(DESTDIR)/$(LIBDIR)/,$(library-files))
-- 
GitLab