Small tweaks

Makefile

@@ -13,12 +13,12 @@ DESTDIR =
 
 LINK = ln -sf
 
-ifeq ($(DEFAULT_QT),5)
-PYUIC ?= pyuic5
-PYRCC ?= pyrcc5
-else
+ifeq ($(DEFAULT_QT),4)
 PYUIC ?= pyuic4 -w
 PYRCC ?= pyrcc4 -py3
+else
+PYUIC ?= pyuic5
+PYRCC ?= pyrcc5
 endif
 
 # --------------------------------------------------------------
@@ -85,9 +85,9 @@ source/modules/%.qt5.a: .FORCE
 
 # --------------------------------------------------------------
 
-backend: bin/libcarla_standalone2.$(LIB_EXT)
+backend: bin/libcarla_standalone2$(LIB_EXT)
 
-bin/libcarla_standalone2.$(LIB_EXT): libs .FORCE
+bin/libcarla_standalone2$(LIB_EXT): libs .FORCE
 	$(MAKE) -C source/backend
 
 # --------------------------------------------------------------
@@ -107,16 +107,16 @@ bin/carla-discovery-native$(APP_EXT): libs .FORCE
 # --------------------------------------------------------------
 
 # FIXME
-plugin: source/plugin/carla-native.lv2/carla-native.$(LIB_EXT)
+plugin: source/plugin/carla-native.lv2/carla-native$(LIB_EXT)
 
-source/plugin/carla-native.lv2/carla-native.$(LIB_EXT): #libs .FORCE
+source/plugin/carla-native.lv2/carla-native$(LIB_EXT): #libs .FORCE
 	$(MAKE) -C source/plugin
 
 # --------------------------------------------------------------
 
-theme: bin/styles/carlastyle.$(LIB_EXT)
+theme: bin/styles/carlastyle$(LIB_EXT)
 
-bin/styles/carlastyle.$(LIB_EXT): libs .FORCE
+bin/styles/carlastyle$(LIB_EXT): .FORCE
 	$(MAKE) -C source/modules/theme
 
 # --------------------------------------------------------------

source/Makefile.mk

@@ -261,16 +261,16 @@ endif
 LIBLO_FLAGS  = $(shell pkg-config --cflags liblo)
 LIBLO_LIBS   = $(shell pkg-config --libs liblo)
 
-ifeq ($(DEFAULT_QT),5)
-QTCORE_FLAGS = $(shell pkg-config --cflags Qt5Core)
-QTCORE_LIBS  = $(shell pkg-config --libs Qt5Core)
-QTXML_FLAGS  = $(shell pkg-config --cflags Qt5Xml)
-QTXML_LIBS   = $(shell pkg-config --libs Qt5Xml)
-else
+ifeq ($(DEFAULT_QT),4)
 QTCORE_FLAGS = $(shell pkg-config --cflags QtCore)
 QTCORE_LIBS  = $(shell pkg-config --libs QtCore)
 QTXML_FLAGS  = $(shell pkg-config --cflags QtXml)
 QTXML_LIBS   = $(shell pkg-config --libs QtXml)
+else
+QTCORE_FLAGS = $(shell pkg-config --cflags Qt5Core)
+QTCORE_LIBS  = $(shell pkg-config --libs Qt5Core)
+QTXML_FLAGS  = $(shell pkg-config --cflags Qt5Xml)
+QTXML_LIBS   = $(shell pkg-config --libs Qt5Xml)
 endif
 
 ifeq ($(HAVE_CSOUND),true)
@@ -334,7 +334,7 @@ JUCE_EVENTS_LIBS         = $(shell pkg-config --libs x11)
 JUCE_GRAPHICS_FLAGS      = $(shell pkg-config --cflags x11 xinerama xext freetype2)
 JUCE_GRAPHICS_LIBS       = $(shell pkg-config --libs x11 xinerama xext freetype2)
 JUCE_GUI_BASICS_FLAGS    = $(shell pkg-config --cflags x11 xinerama xext xcursor)
-JUCE_GUI_BASICS_LIBS     = $(shell pkg-config --libs x11 xinerama xext xcursor) -ldl
+JUCE_GUI_BASICS_LIBS     = $(shell pkg-config --libs x11 xinerama xext xcursor)
 endif
 LILV_LIBS                = -ldl -lm -lrt
 ifeq ($(HAVE_ALSA),true)
@@ -451,14 +451,14 @@ endif
 # --------------------------------------------------------------
 # Set shared lib extension
 
-LIB_EXT = so
+LIB_EXT = .so
 
 ifeq ($(MACOS),true)
-LIB_EXT = dylib
+LIB_EXT = .dylib
 endif
 
 ifeq ($(WIN32),true)
-LIB_EXT = dll
+LIB_EXT = .dll
 endif
 
 # --------------------------------------------------------------

source/backend/Makefile

@@ -90,7 +90,7 @@ OBJS = \
 	CarlaStandalone.cpp.o
 
 TARGETS = \
-	../../bin/libcarla_standalone.$(LIB_EXT)
+	../../bin/libcarla_standalone2$(LIB_EXT)
 
 # --------------------------------------------------------------
 
@@ -117,7 +117,7 @@ CarlaStandalone.cpp.o: CarlaStandalone.cpp $(CARLA_STANDALONE_CPP_DEPS)
 
 # --------------------------------------------------------------
 
-../../bin/libcarla_standalone.$(LIB_EXT): $(OBJS) $(STANDALONE_LIBS)
+../../bin/libcarla_standalone2$(LIB_EXT): $(OBJS) $(STANDALONE_LIBS)
 	$(CXX) $< $(LIBS_START) $(STANDALONE_LIBS) $(LIBS_END) $(LINK_FLAGS) $(STANDALONE_FLAGS) $(SHARED) -o $@
 
 # --------------------------------------------------------------