More makefiles rework

.gitignore

@@ -36,6 +36,9 @@ resources.*.cpp
 *_rc.py
 ui_*.py
 
+# Misc files
+*.ttl
+
 # PyQt widgets
 source/canvaspreviewframe.py
 source/carla_config.py
@@ -73,7 +76,6 @@ carla-native-lv2-export
 data/windows/Carla
 data/windows/CarlaControl
 source/bridges/jackplugin/libjack.so.0
-source/plugin/carla-native.lv2/*.ttl
 source/tests/ansi-pedantic-test_*
 source/tests/CarlaString
 source/tests/EngineEvents
@@ -89,13 +91,14 @@ doc/CarlaBridge/
 doc/DISTRHO/
 
 # CX-Freeze builds
-src/dist/
+source/dist/
 
 # QtCreator builds
 *build-*Debug/
 *build-*Release/
 
 # python files in plugin resources dir
+bin/resources/*.py
 source/modules/native-plugins/resources/*.py
 
 # zynaddsubfx
@@ -139,6 +142,7 @@ source/includes/asio/
 source/includes/rewire/
 source/includes/vst/
 source/includes/vst3/
+source/includes/config.h
 
 data/macos/*.gz
 data/macos/*.tgz

Makefile

@@ -106,11 +106,17 @@ bin/carla-discovery-native$(APP_EXT): libs .FORCE
 
 # --------------------------------------------------------------
 
-# FIXME
-plugin: source/plugin/carla-native.lv2/carla-native$(LIB_EXT)
+plugin: bin/carla-native.lv2/manifest.ttl
 
-source/plugin/carla-native.lv2/carla-native$(LIB_EXT): #libs .FORCE
-	$(MAKE) -C source/plugin
+bin/carla-native.lv2/carla-native$(LIB_EXT): backend .FORCE
+	$(MAKE) -C source/plugin ../../$@
+
+bin/carla-native.lv2/manifest.ttl: bin/carla-native-lv2-export$(APP_EXT) bridges discovery .FORCE
+	cd bin && ./carla-native-lv2-export$(APP_EXT); cd ..
+	cd bin/carla-native.lv2 && $(LINK) ../*bridge-* ../carla-discovery-* .; cd ..
+
+bin/carla-native-lv2-export$(APP_EXT): bin/carla-native.lv2/carla-native$(LIB_EXT) .FORCE
+	$(MAKE) -C source/plugin ../../$@
 
 # --------------------------------------------------------------
 
@@ -150,7 +156,6 @@ wine64:
 # Resources
 
 RES = \
-	bin/resources/carla-plugin \
 	bin/resources/carla_backend.py \
 	bin/resources/carla_config.py \
 	bin/resources/carla_database.py \
@@ -202,9 +207,6 @@ endif
 source/resources_rc.py: resources/resources.qrc resources/*/*.png resources/*/*.svg
 	$(PYRCC) $< -o $@
 
-bin/resources/carla-plugin: source/carla-plugin
-	$(LINK) $(CURDIR)/source/carla-plugin bin/resources/
-
 bin/resources/%.py: source/%.py
 	$(LINK) $(CURDIR)/source/$*.py bin/resources/
 
@@ -376,8 +378,8 @@ install:
 	install -m 644 source/includes/CarlaDefines.h $(DESTDIR)$(PREFIX)/include/carla/includes/
 
 	# Install resources (main)
-	install -m 644 bin/resources/carla-plugin      $(DESTDIR)$(PREFIX)/share/carla/resources/
-	install -m 644 bin/resources/*-ui              $(DESTDIR)$(PREFIX)/share/carla/resources/
+	install -m 755 bin/resources/carla-plugin      $(DESTDIR)$(PREFIX)/share/carla/resources/
+	install -m 755 bin/resources/*-ui              $(DESTDIR)$(PREFIX)/share/carla/resources/
 	install -m 644 bin/resources/nekofilter/*.png  $(DESTDIR)$(PREFIX)/share/carla/resources/nekofilter/
 	install -m 644 bin/resources/zynaddsubfx/*.png $(DESTDIR)$(PREFIX)/share/carla/resources/zynaddsubfx/
 

bin/carla-native.lv2/resources

@@ -0,0 +1 @@
+../../source/modules/native-plugins/resources/

bin/carla-native.lv2/styles

@@ -0,0 +1 @@
+../../source/modules/theme/styles/

source/carla_shared.py

@@ -515,35 +515,40 @@ def initHost(initName, libPrefix = None, failError = True):
         libname += ".so"
 
     # -------------------------------------------------------------
-    # Search for the Carla library
+    # Set binary dir
 
-    libfilename = ""
+    CWDl = CWD.lower()
 
     if libPrefix is not None:
-        libfilename = os.path.join(libPrefix, "lib", "carla", libname)
+        gCarla.pathBinaries = os.path.join(libPrefix, "lib", "carla")
 
-    elif CWD.endswith("resources"):
-        libfilename = os.path.join(CWD, "..", libname)
+    elif CWDl.endswith("resources"):
+        gCarla.pathBinaries = os.path.abspath(os.path.join(CWD, ".."))
 
-    elif CWD.endswith("source"):
-        libfilename = os.path.join(CWD, "..", "bin", libname)
+    elif CWDl.endswith("source"):
+        gCarla.pathBinaries = os.path.abspath(os.path.join(CWD, "..", "bin"))
 
     # -------------------------------------------------------------
+    # Fail if binary dir is not found
 
-    if not (libfilename or gCarla.isPlugin):
+    if not (gCarla.pathBinaries or gCarla.isPlugin):
         if failError:
             QMessageBox.critical(None, "Error", "Failed to find the carla library, cannot continue")
             sys.exit(1)
         return
 
     # -------------------------------------------------------------
-    # Set paths
+    # Set resources dir
 
-    gCarla.pathBinaries  = libfilename.replace(libname, "")
-    gCarla.pathResources = os.path.join(gCarla.pathBinaries, "resources")
+    if libPrefix is not None:
+        gCarla.pathResources = os.path.join(libPrefix, "share", "carla", "resources")
+    else:
+        gCarla.pathResources = os.path.join(gCarla.pathBinaries, "resources")
+
+    # -------------------------------------------------------------
+    # Print info
 
     print("Carla %s started, status:" % VERSION)
-    print("  backend lib:   %s" % libfilename)
     print("  binary dir:    %s" % gCarla.pathBinaries)
     print("  resources dir: %s" % gCarla.pathResources)
 
@@ -552,7 +557,7 @@ def initHost(initName, libPrefix = None, failError = True):
 
     if gCarla.host is None:
         try:
-            gCarla.host = Host(libfilename)
+            gCarla.host = Host(os.path.join(gCarla.pathBinaries, libname))
         except:
             print("hmmmm...")
             return

source/carla_style.py

@@ -49,16 +49,22 @@ class CarlaApplication(object):
         # try to find styles dir
         stylesDir = ""
 
+        CWDl = CWD.lower()
+
         if libPrefix is not None:
             stylesDir = os.path.join(libPrefix, "lib", "carla")
 
-        elif CWD.endswith("resources"):
-            stylesDir = os.path.join(CWD, "..")
+        elif CWDl.endswith("resources"):
+            if CWDl.endswith("native-plugins%sresources" % os.sep):
+                stylesDir = os.path.abspath(os.path.join(CWD, "..", "..", "..", "..", "bin"))
+            else:
+                stylesDir = os.path.abspath(os.path.join(CWD, ".."))
 
-        elif CWD.endswith("source"):
-            stylesDir = os.path.join(CWD, "..", "bin")
+        elif CWDl.endswith("source"):
+            stylesDir = os.path.abspath(os.path.join(CWD, "..", "bin"))
 
         if stylesDir:
+            print("TEST : ", stylesDir, " : ", CWD)
             QApplication.addLibraryPath(stylesDir)
 
         elif not config_UseQt5:

source/plugin/Makefile

@@ -1,26 +1,16 @@
 #!/usr/bin/make -f
-# Makefile for carla plugin exports #
-# --------------------------------- #
+# Makefile for carla plugin #
+# ------------------------- #
 # Created by falkTX
 #
 
+CWD=..
 include ../Makefile.mk
 
-BUILD_CXX_FLAGS += -I../backend -I../includes -I../utils -isystem ../modules
-
 # --------------------------------------------------------------
 
-ifeq ($(HAVE_AF_DEPS),true)
-BUILD_CXX_FLAGS += -DWANT_AUDIOFILE
-endif
-
-ifeq ($(HAVE_MF_DEPS),true)
-BUILD_CXX_FLAGS += -DWANT_MIDIFILE
-endif
-
-ifeq ($(HAVE_ZYN_DEPS),true)
-BUILD_CXX_FLAGS += -DWANT_ZYNADDSUBFX
-endif
+BUILD_CXX_FLAGS += -I../backend -I../includes -I../utils -isystem ../modules
+BUILD_CXX_FLAGS += $(NATIVE_PLUGINS_FLAGS)
 
 # --------------------------------------------------------------
 # Common
@@ -108,15 +98,9 @@ endif
 
 # --------------------------------------------------------------
 
-ifeq ($(WIN32),true)
-TARGETS = carla-native-lv2-export.exe carla-native.lv2/carla-native.dll
-else
-ifeq ($(MACOS),true)
-TARGETS = carla-native-lv2-export carla-native.lv2/carla-native.dylib
-else
-TARGETS = carla-native-lv2-export carla-native.lv2/carla-native.so
-endif
-endif
+TARGETS = \
+	../../bin/carla-native.lv2/carla-native$(LIB_EXT) \
+	../../bin/carla-native-lv2-export$(APP_EXT)
 
 # --------------------------------------------------------------
 
@@ -142,41 +126,10 @@ carla-native-lv2-export.cpp.o: carla-native-lv2-export.cpp carla-native-base.cpp
 
 # --------------------------------------------------------------
 
-carla-native-lv2-export: carla-native-lv2-export.cpp.o $(LIBS)
-ifneq ($(MACOS),true)
-	$(CXX) $< -Wl,--start-group $(LIBS) -Wl,--end-group $(LINK_FLAGS) -o $@
-else
-	$(CXX) $< $(LIBS) $(LINK_FLAGS) -o $@
-endif
-	./carla-native-lv2-export
-
-carla-native-lv2-export.exe: carla-native-lv2-export.cpp.o $(LIBS)
-	$(CXX) $< -Wl,--start-group $(LIBS) -Wl,--end-group $(LINK_FLAGS) -o $@
-	./carla-native-lv2-export.exe
-
-# --------------------------------------------------------------
-
-carla-native.lv2/carla-native.dll: carla-native-lv2.cpp.o $(LIBS)
-	$(CXX) $< -Wl,--start-group $(LIBS) -Wl,--end-group -shared $(LINK_FLAGS) -o $@
-
-carla-native.lv2/carla-native.dylib: carla-native-lv2.cpp.o $(LIBS)
-	$(CXX) $< $(LIBS) -dynamiclib $(LINK_FLAGS) -o $@
-
-carla-native.lv2/carla-native.so: carla-native-lv2.cpp.o $(LIBS)
-	$(CXX) $< -Wl,--start-group $(LIBS) -Wl,--end-group -shared $(LINK_FLAGS) -o $@
-
-# --------------------------------------------------------------
-
-.FORCE:
-.PHONY: .FORCE carla-native-lv2-export
-
-../backend/carla_engine_plugin.a: .FORCE
-	$(MAKE) -C ../backend/engine ../carla_engine_plugin.a
-
-../backend/carla_plugin.a: .FORCE
-	$(MAKE) -C ../backend/plugin ../carla_plugin.a
+../../bin/carla-native.lv2/carla-native$(LIB_EXT): carla-native-lv2.cpp.o $(LIBS)
+	$(CXX) $< $(LIBS_START) $(LIBS) $(LIBS_END) $(SHARED) $(LINK_FLAGS) -o $@
 
-../modules/%.a: .FORCE
-	$(MAKE) -C ../modules $*
+../../bin/carla-native-lv2-export$(APP_EXT): carla-native-lv2-export.cpp.o $(LIBS)
+	$(CXX) $< $(LIBS_START) $(LIBS) $(LIBS_END) $(LINK_FLAGS) -o $@
 
 # --------------------------------------------------------------

source/plugin/carla-native.lv2/resources

@@ -1 +0,0 @@
-../../modules/native-plugins/resources