From 05fd918acaa997e89a41fdde529771c423895cf5 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Wed, 24 Apr 2013 22:55:31 +0100
Subject: [PATCH] Misc

---
 .gitignore                             | 3 ++-
 source/libs/jackbridge/JackBridge2.cpp | 4 +++-
 source/libs/jackbridge/Makefile        | 2 +-
 source/tests/Makefile                  | 3 +++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index ec2225d08..bbfe8d817 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,6 +67,7 @@ source/tests/ANSI
 source/tests/Base64
 source/tests/CarlaString
 source/tests/Print
+source/tests/Rewire.cpp
 source/tests/RtList
 source/tests/Thread
 source/tests/Utils
@@ -118,6 +119,6 @@ source/backend/native/zynaddsubfx/UI/VirKeyboard.cpp
 source/backend/native/zynaddsubfx/UI/VirKeyboard.h
 
 # Other
+source/includes/rewire/
 source/includes/vst/
 source/includes/vst3/
-source/libs/jackbridge/jack
diff --git a/source/libs/jackbridge/JackBridge2.cpp b/source/libs/jackbridge/JackBridge2.cpp
index 36bda39d5..c4a0c8b09 100644
--- a/source/libs/jackbridge/JackBridge2.cpp
+++ b/source/libs/jackbridge/JackBridge2.cpp
@@ -16,7 +16,7 @@
 
 #include "CarlaDefines.hpp"
 
-// don't include the whole JACK deal in this file
+// don't include the whole JACK API in this file
 CARLA_EXPORT bool jackbridge_sem_post(void* sem);
 CARLA_EXPORT bool jackbridge_sem_timedwait(void* sem, int secs);
 
@@ -80,3 +80,5 @@ bool jackbridge_sem_timedwait(void* sem, int secs)
 # endif
 }
 #endif
+
+// -----------------------------------------------------------------------------
diff --git a/source/libs/jackbridge/Makefile b/source/libs/jackbridge/Makefile
index 058f4d1c0..590440e2e 100644
--- a/source/libs/jackbridge/Makefile
+++ b/source/libs/jackbridge/Makefile
@@ -29,7 +29,7 @@ WINE_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32/wine -L/usr/lib/i386-linux-gnu/wi
 WINE_64BIT_FLAGS = $(64BIT_FLAGS) -L/usr/lib64/wine -L/usr/lib/x86_64-linux-gnu/wine
 WINE_LINK_FLAGS  = $(LINK_FLAGS) -ldl -lrt -lpthread -ljack
 
-OBJS = JackBridge2.cpp JackBridge1.cpp
+OBJS = JackBridge1.cpp JackBridge2.cpp
 
 # --------------------------------------------------------------
 
diff --git a/source/tests/Makefile b/source/tests/Makefile
index 4c34bb8c9..562215631 100644
--- a/source/tests/Makefile
+++ b/source/tests/Makefile
@@ -41,6 +41,9 @@ Print: Print.cpp
 Utils: Utils.cpp
 	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) -o $@
 
+Rewire.exe: Rewire.cpp
+	$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) -lversion -o $@
+
 RUN: $(TARGETS)
 # 	valgrind ./Base64
 # 	./ANSI