From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Wed, 13 Nov 2013 05:11:37 +0000 (+0100)
Subject: Fix error with multiple IDL files
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/omk.git/commitdiff_plain/d3dfc8e75df6f8c1209f16420cbce1d0be0819f1?hp=525ba0509b8bdd0aa49b4fc7eacbfb4d56ac7bfa

Fix error with multiple IDL files

... whitespace is sometimes important in Makefiles.
---

diff --git a/snippets/linux.omk b/snippets/linux.omk
index 51d5dbf..94400e1 100644
--- a/snippets/linux.omk
+++ b/snippets/linux.omk
@@ -196,6 +196,7 @@ endef
 
 # Syntax: $(call COMPILE_idl_template,</path/to/src.idl>,<basename>)
 define COMPILE_idl_template
+
 ifeq ($$($(2)_IDL_TARGET),)
 $(2)_IDL_TARGET=1
 GEN_HEADERS+=$(filter %.h,$(notdir $(1:%.idl=%.h))) # Do we need this global variable?
diff --git a/tests/idl b/tests/idl
index 17e082c..313c063 100755
--- a/tests/idl
+++ b/tests/idl
@@ -26,6 +26,7 @@ lib_LIBRARIES = idlserver
 idlserver_SERVER_IDL = test.idl
 EOF
 
+create_idlcomp() {
 cat > idlcomp <<EOF
 #!/bin/sh
 out=\$(basename \${1%.idl})
@@ -37,6 +38,8 @@ echo "extern volatile int idl_skels;
       extern volatile int idl_stubs;" > \${out}.h
 EOF
 chmod +x idlcomp
+}
+create_idlcomp
 
 cat > testclient.c <<EOF
 #include "test.h"
@@ -59,3 +62,20 @@ EOF
 
 needs_valid_CC
 WVPASS make V=1 IDL_COMPILER=$PWD/idlcomp
+
+WVSTART "Two idl files in a program"
+create_idlcomp
+cat > test1.idl <<< "# IDL input for dummy IDL compiler"
+cat > test2.idl <<< "# IDL input for dummy IDL compiler"
+cat > testclient.c <<< "int main() {return 0;}"
+
+cat > Makefile.omk <<EOF
+bin_PROGRAMS = testclient
+INCLUDES=-I.
+
+testclient_SOURCES = testclient.c
+testclient_CLIENT_IDL = test1.idl test2.idl
+EOF
+cat > config.omk <<< IDL_COMPILER=$PWD/idlcomp
+
+WVPASS make