Update main makefile

Makefile

@@ -9,25 +9,54 @@ DESTDIR =
 
 SED_PREFIX = $(shell echo $(PREFIX) | sed "s/\//\\\\\\\\\//g")
 
-LINK  = ln -s
+LINK  = ln -sf
 PYUIC = pyuic4
 PYRCC = pyrcc4 -py3
 
+# -----------------------------------------------------------------------------------------------------------------------------------------
 
 all: CPP RES UI WIDGETS
 
+# -----------------------------------------------------------------------------------------------------------------------------------------
+# C++ code
 
-# ------------------------------------------------------------------------------------------------------------------------------------------------------
-
-CPP: backend discovery
+CPP: backend bridges discovery
 
 backend:
 	$(MAKE) -C source/backend
 
+bridges:
+	$(MAKE) -C source/bridges
+
 discovery:
 	$(MAKE) -C source/discovery
 
-# ------------------------------------------------------------------------------------------------------------------------------------------------------
+posix32:
+	$(MAKE) -C source/bridge posix32
+	$(MAKE) -C source/discovery posix32
+
+posix64:
+	$(MAKE) -C source/bridge posix64
+	$(MAKE) -C source/discovery posix64
+
+win32:
+	$(MAKE) -C source/bridge win32
+	$(MAKE) -C source/discovery win32
+
+win64:
+	$(MAKE) -C source/bridge win64
+	$(MAKE) -C source/discovery win64
+
+wine32:
+	$(MAKE) -C source/jackbridge wine32
+	$(LINK) source/libs/jackbridge/libcarla-jackbridge-win32.dll.so source/bridge/libcarla-jackbridge-win32.dll
+
+wine64:
+	$(MAKE) -C source/jackbridge wine64
+	$(LINK) source/libs/jackbridge/libcarla-jackbridge-win64.dll.so source/bridge/libcarla-jackbridge-win64.dll
+
+# -----------------------------------------------------------------------------------------------------------------------------------------
+# Resources
 
 RES = source/resources_rc.py
 
@@ -36,7 +65,8 @@ RES: $(RES)
 source/resources_rc.py: resources/resources.qrc
 	$(PYRCC) $< -o $@
 
-# ------------------------------------------------------------------------------------------------------------------------------------------------------
+# -----------------------------------------------------------------------------------------------------------------------------------------
+# UI code
 
 UIs = source/ui_carla.py source/ui_carla_control.py\
 	source/ui_carla_about.py source/ui_carla_database.py source/ui_carla_edit.py source/ui_carla_parameter.py source/ui_carla_plugin.py source/ui_carla_refresh.py \
@@ -47,7 +77,8 @@ UI: $(UIs)
 source/ui_%.py: resources/ui/%.ui
 	$(PYUIC) $< -o $@
 
-# ------------------------------------------------------------------------------------------------------------------------------------------------------
+# -----------------------------------------------------------------------------------------------------------------------------------------
+# Widgets
 
 WIDGETS = source/digitalpeakmeter.py source/ledbutton.py source/paramspinbox.py source/pixmapdial.py source/pixmapkeyboard.py
 
@@ -56,50 +87,23 @@ WIDGETS: $(WIDGETS)
 source/%.py: source/widgets/%.py
 	$(LINK) widgets/$*.py $@
 
-# ------------------------------------------------------------------------------------------------------------------------------------------------------
-
-debug:
-	$(MAKE) DEBUG=true
-
-# doxygen:
-# 	$(MAKE) doxygen -C source/backend
-
-# ------------------------------------------------------------------------------------------------------------------------------------------------------
-
-posix32:
-	$(MAKE) -C source/bridge posix32
-	$(MAKE) -C source/discovery posix32
-
-posix64:
-	$(MAKE) -C source/bridge posix64
-	$(MAKE) -C source/discovery posix64
-
-win32:
-	$(MAKE) -C source/bridge win32
-	$(MAKE) -C source/discovery win32
-
-win64:
-	$(MAKE) -C source/bridge win64
-	$(MAKE) -C source/discovery win64
-
-wine32:
-	$(MAKE) -C source/jackbridge wine32
-	$(LINK) source/libs/jackbridge/libcarla-jackbridge-win32.dll.so source/bridge/libcarla-jackbridge-win32.dll
-
-wine64:
-	$(MAKE) -C source/jackbridge wine64
-	$(LINK) source/libs/jackbridge/libcarla-jackbridge-win64.dll.so source/bridge/libcarla-jackbridge-win64.dll
-
-# ------------------------------------------------------------------------------------------------------------------------------------------------------
+# -----------------------------------------------------------------------------------------------------------------------------------------
 
 clean:
 	$(MAKE) clean -C source/backend
+	$(MAKE) clean -C source/bridges
 	$(MAKE) clean -C source/discovery
 	rm -f $(RES)
 	rm -f $(UIs)
 	rm -f $(WIDGETS)
-	rm -f *~ source/*~ source/*.pyc
-# 	rm -rf source/*/doxygen
+	rm -f *~ source/*~ source/*.pyc source/ui_*.py source/resources_rc.py
+
+# -----------------------------------------------------------------------------------------------------------------------------------------
+
+debug:
+	$(MAKE) DEBUG=true
+
+# -----------------------------------------------------------------------------------------------------------------------------------------
 
 install:
 	# Create directories
@@ -158,6 +162,8 @@ install:
 		$(DESTDIR)$(PREFIX)/bin/carla-control \
 		$(DESTDIR)$(PREFIX)/bin/carla-standalone \
 
+# -----------------------------------------------------------------------------------------------------------------------------------------
+
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/carla*
 	rm -f $(DESTDIR)$(PREFIX)/share/applications/carla.desktop