Update to new DPF makefile style

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "dpf"]
 	path = dpf
-	url = git://github.com/DISTRHO/DPF
+	url = https://github.com/DISTRHO/DPF

Makefile

@@ -4,18 +4,21 @@
 # Created by falkTX
 #
 
-include Makefile.mk
+include dpf/Makefile.base.mk
 
-all: libs plugins gen
+all: dgl plugins gen
 
 # --------------------------------------------------------------
 
-libs:
+dgl:
+ifeq ($(HAVE_DGL),true)
 	$(MAKE) -C dpf/dgl
+endif
 
-plugins: libs
+plugins: dgl
 	$(MAKE) all -C plugins/glBars
 
+ifneq ($(CROSS_COMPILING),true)
 gen: plugins dpf/utils/lv2_ttl_generator
 	@$(CURDIR)/dpf/utils/generate-ttl.sh
 ifeq ($(MACOS),true)
@@ -24,6 +27,9 @@ endif
 
 dpf/utils/lv2_ttl_generator:
 	$(MAKE) -C dpf/utils/lv2-ttl-generator
+else
+gen:
+endif
 
 # --------------------------------------------------------------
 
@@ -31,6 +37,7 @@ clean:
 	$(MAKE) clean -C dpf/dgl
 	$(MAKE) clean -C dpf/utils/lv2-ttl-generator
 	$(MAKE) clean -C plugins/glBars
+	rm -rf bin build
 
 # --------------------------------------------------------------
 

Makefile.mk

@@ -1,146 +0,0 @@
-#!/usr/bin/make -f
-# Makefile for DISTRHO Plugins #
-# ---------------------------- #
-# Created by falkTX
-#
-
-AR  ?= ar
-CC  ?= gcc
-CXX ?= g++
-
-# --------------------------------------------------------------
-# Fallback to Linux if no other OS defined
-
-ifneq ($(HAIKU),true)
-ifneq ($(MACOS),true)
-ifneq ($(WIN32),true)
-LINUX=true
-endif
-endif
-endif
-
-# --------------------------------------------------------------
-# Set build and link flags
-
-BASE_FLAGS = -Wall -Wextra -pipe
-BASE_OPTS  = -O2 -ffast-math -mtune=generic -msse -msse2 -fdata-sections -ffunction-sections
-
-ifneq ($(MACOS),true)
-# MacOS doesn't support this
-BASE_OPTS += -mfpmath=sse
-endif
-
-ifeq ($(MACOS),true)
-# MacOS linker flags
-LINK_OPTS  = -fdata-sections -ffunction-sections -Wl,-dead_strip -Wl,-dead_strip_dylibs
-else
-# Common linker flags
-LINK_OPTS  = -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,-O1 -Wl,--as-needed -Wl,--strip-all
-endif
-
-ifeq ($(RASPPI),true)
-# Raspberry-Pi optimization flags
-BASE_OPTS  = -O2 -ffast-math -march=armv6 -mfpu=vfp -mfloat-abi=hard
-LINK_OPTS  = -Wl,-O1 -Wl,--as-needed -Wl,--strip-all
-endif
-
-ifeq ($(PANDORA),true)
-# OpenPandora optimization flags
-BASE_OPTS  = -O2 -ffast-math -march=armv7-a -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
-LINK_OPTS  = -Wl,-O1 -Wl,--as-needed -Wl,--strip-all
-endif
-
-ifeq ($(NOOPT),true)
-# No optimization flags
-BASE_OPTS  = -O2 -ffast-math -fdata-sections -ffunction-sections
-endif
-
-ifneq ($(WIN32),true)
-# not needed for Windows
-BASE_FLAGS += -fPIC -DPIC
-endif
-
-ifeq ($(DEBUG),true)
-BASE_FLAGS += -DDEBUG -O0 -g
-LINK_OPTS   =
-else
-BASE_FLAGS += -DNDEBUG $(BASE_OPTS) -fvisibility=hidden
-CXXFLAGS   += -fvisibility-inlines-hidden
-endif
-
-BUILD_C_FLAGS   = $(BASE_FLAGS) -std=c99 -std=gnu99 $(CFLAGS)
-BUILD_CXX_FLAGS = $(BASE_FLAGS) -std=c++0x -std=gnu++0x $(CXXFLAGS) $(CPPFLAGS)
-LINK_FLAGS      = $(LINK_OPTS) -Wl,--no-undefined $(LDFLAGS)
-
-ifeq ($(MACOS),true)
-# No C++11 support
-BUILD_CXX_FLAGS = $(BASE_FLAGS) $(CXXFLAGS) $(CPPFLAGS)
-LINK_FLAGS      = $(LINK_OPTS) $(LDFLAGS)
-endif
-
-# --------------------------------------------------------------
-# Check for optional & required libs
-
-ifeq ($(LINUX),true)
-HAVE_DGL  = $(shell pkg-config --exists gl x11 && echo true)
-HAVE_JACK = $(shell pkg-config --exists jack   && echo true)
-endif
-
-ifeq ($(MACOS),true)
-HAVE_DGL = true
-endif
-
-ifeq ($(WIN32),true)
-HAVE_DGL = true
-endif
-
-ifneq ($(HAVE_DGL),true)
-$(error OpenGL missing, cannot continue)
-endif
-
-# --------------------------------------------------------------
-# Set libs stuff
-
-ifeq ($(LINUX),true)
-DGL_FLAGS = $(shell pkg-config --cflags gl x11)
-DGL_LIBS  = $(shell pkg-config --libs gl x11)
-endif
-
-ifeq ($(MACOS),true)
-DGL_LIBS  = -framework OpenGL -framework Cocoa
-endif
-
-ifeq ($(WIN32),true)
-DGL_LIBS  = -lopengl32 -lgdi32
-endif
-
-# --------------------------------------------------------------
-# Set app extension
-
-ifeq ($(WIN32),true)
-APP_EXT = .exe
-endif
-
-# --------------------------------------------------------------
-# Set shared lib extension
-
-LIB_EXT = .so
-
-ifeq ($(MACOS),true)
-LIB_EXT = .dylib
-endif
-
-ifeq ($(WIN32),true)
-LIB_EXT = .dll
-endif
-
-# --------------------------------------------------------------
-# Set shared library CLI arg
-
-SHARED = -shared
-
-ifeq ($(MACOS),true)
-SHARED = -dynamiclib
-endif
-
-# --------------------------------------------------------------

dpf

@@ -1 +1 @@
-Subproject commit 4c3550366de6f5fff6b7267d8eae94cff2fe8261
+Subproject commit eb1ec93eedb24e33c5e6d8442d7f2d1bd7038a13

plugins/Makefile.mk

@@ -1,88 +0,0 @@
-#!/usr/bin/make -f
-# Makefile for DISTRHO Plugins #
-# ---------------------------- #
-# Created by falkTX
-#
-
-# NAME, OBJS_DSP and OBJS_UI have been defined before
-
-include ../../Makefile.mk
-
-# --------------------------------------------------------------
-# Basic setup
-
-TARGET_DIR = ../../bin
-
-BUILD_C_FLAGS   += -I.
-BUILD_CXX_FLAGS += -I. -I../../dpf/distrho -I../../dpf/dgl
-
-BASE_FLAGS += -DHAVE_DGL
-
-ifeq ($(HAVE_JACK),true)
-BASE_FLAGS += -DHAVE_JACK
-endif
-
-# --------------------------------------------------------------
-# Set plugin binary file targets
-
-jack = $(TARGET_DIR)/$(NAME)$(APP_EXT)
-lv2  = $(TARGET_DIR)/$(NAME).lv2/$(NAME)$(LIB_EXT)
-vst  = $(TARGET_DIR)/$(NAME)-vst$(LIB_EXT)
-
-# --------------------------------------------------------------
-# Set distrho code files
-
-DISTRHO_PLUGIN_FILES = ../../dpf/distrho/DistrhoPluginMain.cpp
-DISTRHO_UI_FILES     = ../../dpf/distrho/DistrhoUIMain.cpp ../../dpf/libdgl.a
-
-# --------------------------------------------------------------
-# all needs to be first
-
-all:
-
-# --------------------------------------------------------------
-# Common
-
-%.c.o: %.c
-	$(CC) $< $(BUILD_C_FLAGS) -MD -MP -c -o $@
-
-%.cpp.o: %.cpp
-	$(CXX) $< $(BUILD_CXX_FLAGS) -MD -MP -c -o $@
-
-clean:
-	rm -f *.d *.o
-	rm -rf $(TARGET_DIR)/$(NAME) $(TARGET_DIR)/$(NAME)-* $(TARGET_DIR)/$(NAME).lv2/
-
-# --------------------------------------------------------------
-# JACK
-
-jack: $(jack)
-
-$(jack): $(OBJS_DSP) $(OBJS_UI) $(DISTRHO_PLUGIN_FILES) $(DISTRHO_UI_FILES)
-	mkdir -p $(shell dirname $@)
-	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(shell pkg-config --cflags --libs jack) -lpthread -DDISTRHO_PLUGIN_TARGET_JACK -o $@
-
-# --------------------------------------------------------------
-# LV2
-
-lv2: $(lv2)
-
-$(lv2): $(OBJS_DSP) $(OBJS_UI) $(DISTRHO_PLUGIN_FILES) $(DISTRHO_UI_FILES)
-	mkdir -p $(shell dirname $@)
-	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) -lpthread $(SHARED) -DDISTRHO_PLUGIN_TARGET_LV2 -o $@
-
-# --------------------------------------------------------------
-# VST
-
-vst: $(vst)
-
-$(vst): $(OBJS_DSP) $(OBJS_UI) $(DISTRHO_PLUGIN_FILES) $(DISTRHO_UI_FILES)
-	mkdir -p $(shell dirname $@)
-	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) -lpthread $(SHARED) -DDISTRHO_PLUGIN_TARGET_VST -o $@
-
-# --------------------------------------------------------------
-
--include $(OBJS_DSP:%.o=%.d)
--include $(OBJS_UI:%.o=%.d)
-
-# --------------------------------------------------------------

plugins/glBars/Makefile

@@ -12,16 +12,21 @@ NAME = glBars
 # --------------------------------------------------------------
 # Files to build
 
-OBJS_DSP = \
-	DistrhoPluginGLBars.cpp.o
+FILES_DSP = \
+	DistrhoPluginGLBars.cpp
 
-OBJS_UI  = \
-	DistrhoUIGLBars.cpp.o
+FILES_UI  = \
+	DistrhoUIGLBars.cpp
 
 # --------------------------------------------------------------
 # Do some magic
 
-include ../Makefile.mk
+include ../../dpf/Makefile.plugins.mk
+
+# --------------------------------------------------------------
+# Extra flags
+
+LINK_FLAGS += -lpthread
 
 # --------------------------------------------------------------
 # Enable all possible plugin types