Simplify makefiles

Author: falkTX

.gitignore

@@ -1,19 +1,15 @@
 *.a
+*.d
 *.o
 
 *.exe
 *.dll
 *.dylib
 *.so
+*.zip
 
 .kdev_include_paths
 .kdev4/
 
-bin/*-dssi/
-bin/*.lv2/
-bin/PowerJuice
-bin/PowerJuiceX2
-bin/StutterJuice
-bin/TriggerJuice
-bin/VectorJuice
-bin/WobbleJuice
+bin/
+build/

.gitmodules

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

Makefile

@@ -4,26 +4,37 @@
 # Created by falkTX
 #
 
-all: libs plugins gen
+include dpf/Makefile.base.mk
+
+all: dgl plugins gen
 
 # --------------------------------------------------------------
 
-libs:
+dgl:
+ifeq ($(HAVE_DGL),true)
 	$(MAKE) -C dpf/dgl
+endif
 
-plugins: libs
+plugins: dgl
 	$(MAKE) all -C plugins/PowerJuice
 	$(MAKE) all -C plugins/PowerJuiceX2
 	$(MAKE) all -C plugins/StutterJuice
 	$(MAKE) all -C plugins/TriggerJuice
 	$(MAKE) all -C plugins/VectorJuice
 	$(MAKE) all -C plugins/WobbleJuice
 
+ifneq ($(CROSS_COMPILING),true)
 gen: plugins dpf/utils/lv2_ttl_generator
 	@$(CURDIR)/dpf/utils/generate-ttl.sh
+ifeq ($(MACOS),true)
+	@$(CURDIR)/dpf/utils/generate-vst-bundles.sh
+endif
 
 dpf/utils/lv2_ttl_generator:
 	$(MAKE) -C dpf/utils/lv2-ttl-generator
+else
+gen:
+endif
 
 # --------------------------------------------------------------
 
@@ -36,6 +47,7 @@ clean:
 	$(MAKE) clean -C plugins/TriggerJuice
 	$(MAKE) clean -C plugins/VectorJuice
 	$(MAKE) clean -C plugins/WobbleJuice
+	rm -rf bin build
 
 # --------------------------------------------------------------
 

Makefile.mk

@@ -12,25 +12,25 @@ NAME = PowerJuice
 # --------------------------------------------------------------
 # Files to build
 
-OBJS_DSP = \
-	PowerJuicePlugin.cpp.o
+FILES_DSP = \
+	PowerJuicePlugin.cpp
 
-OBJS_UI  = \
-	PowerJuiceArtwork.cpp.o \
-	PowerJuiceUI.cpp.o
+FILES_UI  = \
+	PowerJuiceArtwork.cpp \
+	PowerJuiceUI.cpp
 
 # --------------------------------------------------------------
 # Do some magic
 
-include ../Makefile.mk
+include ../../dpf/Makefile.plugins.mk
 
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
 ifeq ($(LINUX),true)
-all: jack lv2_one vst
+all: jack lv2 vst
 else
-all: lv2_one vst
+all: lv2 vst
 endif
 
 # --------------------------------------------------------------