fix: makefile files

Author: franko

Makefile

@@ -33,9 +33,8 @@ endif
 
 GRAPH_LUA_SRC = init.lua contour.lua
 
-LUA_PATH = $(DEST_PREFIX)/share/lua/5.1
-LUA_DLLPATH = $(DEST_PREFIX)/lib/lua/5.1
-DEBIAN = debian_build/$(PREFIX)
+LUA_PATH = $(DEST_PREFIX)/share/lua/$(LUA_VERSION)
+LUA_DLLPATH = $(DEST_PREFIX)/lib/lua/$(LUA_VERSION)
 WIN_INSTALL_DIR = windows_build
 
 all:
@@ -59,18 +58,6 @@ arch:
 	@install -m 755 -d ${LUA_DLLPATH}
 	@install -m 755 src/libgraphcore.so ${LUA_DLLPATH}/graphcore.so
 
-
-debian:
-	$(MAKE) -C src
-	rm -fr debian_build
-	rm -fr lua-graph-toolkit*.deb
-	mkdir -p $(DEBIAN)/share/lua/5.1
-	mkdir -p $(DEBIAN)/share/lua/5.1/graph
-	mkdir -p $(DEBIAN)/lib/lua/5.1
-	cp src/libgraphcore.so $(DEBIAN)/lib/lua/5.1/graphcore.so
-	cp $(GRAPH_LUA_SRC) $(DEBIAN)/share/lua/5.1/graph
-	fakeroot bash debian/build.sh $(VERSION) $(LUA)
-
 win_install:
 	$(MAKE) -C src
 	mkdir -p $(WIN_INSTALL_DIR)
@@ -80,4 +67,4 @@ win_install:
 	cp $(GRAPH_LUA_SRC) $(WIN_INSTALL_DIR)/lua/graph
 	cp -r examples $(WIN_INSTALL_DIR)
 
-.PHONY: clean all install debian win_install
+.PHONY: clean all install win_install

src/Makefile

@@ -32,19 +32,15 @@ else
   endif
 endif
 
-ARCH := $(shell uname -m)
-
-ifeq ($(ARCH), i686)
-  CCOPT_ARCH = -march=i686
-endif
-
+CFLAGS += -fvisibility=hidden
+CXXFLAGS += -fvisibility=hidden
 ifeq ($(strip $(DEBUG)), yes)
   CFLAGS += -g -Wall
   CXXFLAGS += -g -Wall
   DEFS += -LIBGRAPH_DEBUG
 else
-  CFLAGS += $(CCOPT_ARCH) -O2 -fomit-frame-pointer -ffast-math -Wall
-  CXXFLAGS += $(CCOPT_ARCH) -O2 -fno-exceptions -ffast-math -fno-rtti -Wall
+  CFLAGS += -O2 -fomit-frame-pointer -ffast-math -Wall
+  CXXFLAGS += -O2 -fno-exceptions -ffast-math -fno-rtti -Wall
 endif
 
 PTHREAD_DEFS += -D_REENTRANT
@@ -58,72 +54,55 @@ ifeq ($(strip $(DISABLE_SUBPIXEL_LCD)), yes)
   DEFS += -DDISABLE_SUBPIXEL_AA
 endif
 
-ifeq ($(HOST_SYS),Windows)
-  CC = gcc
-  DYNCC = $(CC)
-  CXX = g++
-  DYNCXX = $(CXX)
-  DLLINK = gcc -static-libgcc -shared
-
-  DISPLAY_SUFFIX = win32
-
-  USER_LIBS_HOME = C:/fra/local
-  USER_INCLUDE = $(USER_LIBS_HOME)/include
+# GWH (for OS X): pkg-config will include "-Wl,-rpath,/opt/local/lib" in AGG_LIBS.
+# If you don't include that, the code won't run unless you first do:
+#   export DYLD_FALLBACK_LIBRARY_PATH=/opt/local/lib
 
-  INCLUDES += -I$(USER_INCLUDE) -I/usr/include -I/usr/pthreads-w32/include
-  LIBS += -L$(USER_LIBS_HOME)/lib
+AGG_INCLUDES = $(shell pkg-config libagg --cflags)
+AGG_LIBS = $(shell pkg-config libagg --libs)
 
-  AGG_INCLUDES = -I$(USER_INCLUDE)/agg2
-  AGG_LIBS = -lagg -lgdi32
+FREETYPE_INCLUDES = $(shell pkg-config freetype2 --cflags)
+FREETYPE_LIBS = $(shell pkg-config freetype2 --libs)
 
-  FREETYPE_INCLUDES = -I$(USER_INCLUDE)/freetype
-  FREETYPE_LIBS = -lfreetype
+LUA_INCLUDES = $(shell pkg-config --cflags $(LUA))
+LUA_LIBS = $(shell pkg-config --libs $(LUA))
 
-  PTHREAD_LIBS = -lpthread
+PTHREAD_DEFS += -pthread
+PTHREAD_LIBS = -lpthread
 
-  LIBGRAPH_SO = graphcore.dll
+INCLUDES += $(LUA_INCLUDES) $(FREETYPE_INCLUDES) $(AGG_INCLUDES)
+LIBS += $(FREETYPE_LIBS) $(AGG_LIBS) $(LUA_LIBS) $(PTHREAD_LIBS)
+DEFS += $(PTHREAD_DEFS)
 
-  LUA_INCLUDES = -IC:/fra/src/luajit-2.0/src
-  LUA_LIBS = -LC:/fra/src/luajit-2.0/src -llua51
+ifeq ($(strip $(LUA)),lua5.4)
+  INCLUDES += -DGRAPH_TK_USE_LUA54
+endif
 
-  LDFLAGS += -Wl,--enable-auto-import
-  LIBS += -L/usr/lib
+ifeq ($(HOST_SYS),Windows)
+  DYNCC = $(CC)
+  DYNCXX = $(CXX)
+  DLLINK = $(CC) -shared -fvisibility=hidden
 
-  DEFS += -DWIN32
+  DISPLAY_SUFFIX = win32
+  LIBGRAPH_SO = graphcore.dll
 else
-  CC = gcc
-  DYNCC = $(CC) -fPIC
-  CXX = g++
-  DYNCXX = $(CXX) -fPIC
-  DLLINK = gcc -shared
-
   X11_INCLUDES = $(shell pkg-config x11 --cflags)
   X11_LIBS = $(shell pkg-config x11 --libs)
 
-# GWH (for OS X): pkg-config will include "-Wl,-rpath,/opt/local/lib" in AGG_LIBS.
-# If you don't include that, the code won't run unless you first do:
-#   export DYLD_FALLBACK_LIBRARY_PATH=/opt/local/lib
+  INCLUDES += $(X11_INCLUDES)
+  LIBS += $(X11_LIBS)
 
-  AGG_INCLUDES = $(shell pkg-config libagg --cflags)
-  AGG_LIBS = $(shell pkg-config libagg --libs)
-
-  FREETYPE_INCLUDES = $(shell pkg-config freetype2 --cflags)
-  FREETYPE_LIBS = $(shell pkg-config freetype2 --libs)
-
-  LUA_INCLUDES = $(shell pkg-config --cflags $(LUA))
-  LUA_LIBS = $(shell pkg-config --libs $(LUA))
-
-  PTHREAD_DEFS += -pthread
-  PTHREAD_LIBS = -lpthread
+  DYNCC = $(CC) -fPIC
+  DYNCXX = $(CXX) -fPIC
+  DLLINK = $(CC) -shared -fvisibility=hidden
 
   ifeq ($(HOST_SYS),Darwin)
     LINK_EXE = $(CXX) $(LDFLAGS)
     LDFLAGS += -Wl,-E
   endif
 
   DISPLAY_SUFFIX = x11
-
-  LIBGRAPH_SO = libgraphcore.so
+  LIBGRAPH_SO = graphcore.so
 endif
 
 LIBGRAPH_A = libgraphcore.a
@@ -137,11 +116,7 @@ else
   PLATFORM_SRC_FILES = agg_platform_support_x11.cpp
 endif
 
-INCLUDES += $(LUA_INCLUDES) $(FREETYPE_INCLUDES) $(X11_INCLUDES) $(AGG_INCLUDES)
-LIBS += $(FREETYPE_LIBS) $(AGG_LIBS) $(X11_LIBS) $(LUA_LIBS) $(PTHREAD_LIBS)
-DEFS += $(PTHREAD_DEFS)
-
-PLOT_CSRC_FILES = str.c gs-types.c lua-utils.c lua-properties.c
+PLOT_CSRC_FILES = str.c gs-types.c lua-utils.c lua-properties.c lua-compat.c
 PLOT_CPPSRC_FILES = gamma.cpp printf_check.cpp utils.cpp \
 	window_registry.cpp fonts_search_$(DISPLAY_SUFFIX).cpp \
 	$(PLATFORM_SRC_FILES) image_write_$(DISPLAY_SUFFIX).cpp \
@@ -199,6 +174,6 @@ clean:
             >> .deps/$(*F).P; \
 	rm .deps/$(*F).pp
 
-.PHONY: debian clean all
+.PHONY: clean all
 
 -include $(DEP_FILES)

src/makeconfig

@@ -5,7 +5,8 @@ DISABLE_GAMMA_CORR = no
 DISABLE_SUBPIXEL_LCD = no
 
 # Can be "luajit" or "lua5.1" to use a specific Lua implementation.
-LUA = lua5.1
+LUA = lua5.4
+LUA_VERSION = 5.4
 
 DEBUG = no