fix: Makefile for hidden symbols of dependency libraries

Author: franko

Makefile

@@ -35,7 +35,6 @@ GRAPH_LUA_SRC = init.lua contour.lua
 
 LUA_PATH = $(DEST_PREFIX)/share/lua/$(LUA_VERSION)
 LUA_DLLPATH = $(DEST_PREFIX)/lib/lua/$(LUA_VERSION)
-WIN_INSTALL_DIR = windows_build
 
 all:
 	$(MAKE) -C src
@@ -47,24 +46,7 @@ install:
 	$(MAKE) -C src
 	mkdir -p $(LUA_PATH)/graph
 	mkdir -p $(LUA_DLLPATH)
-	cp src/libgraphcore.so $(LUA_DLLPATH)/graphcore.so
+	cp src/graphcore.so $(LUA_DLLPATH)/graphcore.so
 	cp $(GRAPH_LUA_SRC) $(LUA_PATH)/graph
 
-arch:
-	@mkdir -p ${LUA_PATH}/graph
-	@install -m 755 -d ${LUA_PATH}/graph
-	@install -m 755 ${GRAPH_LUA_SRC} ${LUA_PATH}/graph
-	@mkdir -p ${LUA_DLLPATH}
-	@install -m 755 -d ${LUA_DLLPATH}
-	@install -m 755 src/libgraphcore.so ${LUA_DLLPATH}/graphcore.so
-
-win_install:
-	$(MAKE) -C src
-	mkdir -p $(WIN_INSTALL_DIR)
-	mkdir -p $(WIN_INSTALL_DIR)/lua
-	mkdir -p $(WIN_INSTALL_DIR)/lua/graph
-	cp src/graphcore.dll $(WIN_INSTALL_DIR)
-	cp $(GRAPH_LUA_SRC) $(WIN_INSTALL_DIR)/lua/graph
-	cp -r examples $(WIN_INSTALL_DIR)
-
-.PHONY: clean all install win_install
+.PHONY: clean all install

src/Makefile

@@ -71,7 +71,7 @@ PTHREAD_DEFS += -pthread
 PTHREAD_LIBS = -lpthread
 
 INCLUDES += $(LUA_INCLUDES) $(FREETYPE_INCLUDES) $(AGG_INCLUDES)
-LIBS += $(FREETYPE_LIBS) $(AGG_LIBS) $(LUA_LIBS) $(PTHREAD_LIBS)
+LIBS += $(FREETYPE_LIBS) $(AGG_LIBS) $(LUA_LIBS) $(PTHREAD_LIBS) $(CPP_SUP_LIBS)
 DEFS += $(PTHREAD_DEFS)
 
 ifeq ($(strip $(LUA)),lua5.4)
@@ -81,7 +81,8 @@ endif
 ifeq ($(HOST_SYS),Windows)
   DYNCC = $(CC)
   DYNCXX = $(CXX)
-  DLLINK = $(CC) -shared -fvisibility=hidden
+  DLLINK = $(CC) -shared
+  LDFLAGS += -fvisibility=hidden
 
   DISPLAY_SUFFIX = win32
   LIBGRAPH_SO = graphcore.dll
@@ -94,10 +95,17 @@ else
 
   DYNCC = $(CC) -fPIC
   DYNCXX = $(CXX) -fPIC
-  DLLINK = $(CC) -shared -fvisibility=hidden
+  DLLINK = $(CC) -shared
+  LDFLAGS += -fvisibility=hidden
+
+  ifeq ($(HOST_SYS),Linux)
+    # See: https://stackoverflow.com/questions/2222162/how-to-apply-fvisibility-option-to-symbols-in-static-libraries
+    # The following flag is to consider hidden all the symbols defined in static libraries we use
+    # to link the shared library.
+    LDFLAGS += -Wl,--exclude-libs,ALL
+  endif
 
   ifeq ($(HOST_SYS),Darwin)
-    LINK_EXE = $(CXX) $(LDFLAGS)
     LDFLAGS += -Wl,-E
   endif
 
@@ -145,7 +153,7 @@ endif
 all: $(TARGETS)
 
 $(LIBGRAPH_SO): $(PLOT_OBJ_FILES)
-	$(DLLINK) $(PLOT_OBJ_FILES) -o $@ $(LIBS) -lsupc++
+	$(DLLINK) $(LDFLAGS) $(PLOT_OBJ_FILES) -o $@ $(LIBS)
 	strip --strip-unneeded $@
 
 $(LIBGRAPH_A): $(PLOT_OBJ_FILES)

src/makeconfig

@@ -4,8 +4,10 @@ DISABLE_GAMMA_CORR = no
 # set this to "yes" if you want to disable subpixel LCD antialiasing
 DISABLE_SUBPIXEL_LCD = no
 
-# Can be "luajit" or "lua5.1" to use a specific Lua implementation.
+# Can be "luajit", "lua5.4" "lua5.1" to use a specific Lua implementation.
 LUA = lua5.4
+
+# vill me used to decide where to install the modules under share/lua
 LUA_VERSION = 5.4
 
 DEBUG = no