- Look for msgpack headers in correct directory

- Fix msgpack target dependencies


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19788 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: sjoelund

Compiler/boot/Makefile.in

@@ -9,7 +9,7 @@ TOP_DIR=@abs_top_builddir@
 OMHOME=@abs_top_builddir@/build
 LDFLAGS=-L.  -L$(GEN_DIR) -L"$(OMHOME)/lib/omc" -lomparse -lomcruntime -lmodparomc -lOpenModelicaRuntimeC -lModelicaExternalC -lantlr3 -lmsgpackc $(CORBALIBS) $(FMILIB) @RT_LDFLAGS@ @LIBSOCKET@ @LIBLPSOLVE55@ @OMC_LIBS@ -lexpat
 FMILIB = -L$(TOP_DIR)/3rdParty/FMIL/install/lib -lfmilib
-CPPFLAGS=-I"$(OMHOME)/include/omc/c" -Iinclude/ @CPPFLAGS@ -DADD_METARECORD_DEFINITIONS=
+CPPFLAGS=-I"$(OMHOME)/include/omc/c" -Iinclude/ -I../../3rdParty/msgpack-0.5.8/src/ @CPPFLAGS@ -DADD_METARECORD_DEFINITIONS=
 CORBALIBS=@CORBALIBS@
 ULIMIT_CMD=true
 SHREXT=@SHREXT@

Makefile.common

@@ -359,29 +359,30 @@ install: install-dirs install-python
 3rdParty/msgpack-0.5.8/Makefile:
 	cd 3rdParty/msgpack-0.5.8 && ./configure "--host=$(host)" CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) $(MSGPACK_CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS) "
 
-build/lib/libmsgpackc.so.2.0.0: 3rdParty/msgpack-0.5.8/Makefile
+build/lib/omc/libmsgpackc.so.2.0.0: 3rdParty/msgpack-0.5.8/Makefile
 	$(MAKE) -C 3rdParty/msgpack-0.5.8
 	cp -a 3rdParty/msgpack-0.5.8/src/.libs/libmsgpackc.so* build/lib/omc/
 
-build/lib/libmsgpackc.2.dylib: 3rdParty/msgpack-0.5.8/Makefile
+build/lib/omc/libmsgpackc.2.dylib: 3rdParty/msgpack-0.5.8/Makefile
 	$(MAKE) -C 3rdParty/msgpack-0.5.8
 	install_name_tool -id @rpath/libmsgpackc.2.dylib 3rdParty/msgpack-0.5.8/src/.libs/libmsgpackc.2.dylib
 	cp -a 3rdParty/msgpack-0.5.8/src/.libs/libmsgpackc.dylib* build/lib/omc/
+	cp -a 3rdParty/msgpack-0.5.8/src/msgpack.h 3rdParty/msgpack-0.5.8/src/msgpack/ $(builddir_inc)/c
 
-build/lib/libmsgpackc.a: 3rdParty/msgpack-0.5.8/Makefile
+build/lib/omc/libmsgpackc.a: 3rdParty/msgpack-0.5.8/Makefile
 	$(MAKE) -C 3rdParty/msgpack-0.5.8
 	cp -a 3rdParty/msgpack-0.5.8/src/.libs/libmsgpackc.a build/lib/omc/
+	cp -a 3rdParty/msgpack-0.5.8/src/msgpack.h 3rdParty/msgpack-0.5.8/src/msgpack/ $(builddir_inc)/c
 
 ifeq ($(SHREXT),.so)
-msgpack: build/lib/libmsgpackc.so.2.0.0
+msgpack: build/lib/omc/libmsgpackc.so.2.0.0
 else
 ifeq ($(SHREXT),.dylib)
-msgpack: build/lib/libmsgpackc.2.dylib
+msgpack: build/lib/omc/libmsgpackc.2.dylib
 else
-msgpack: build/lib/libmsgpackc.a
+msgpack: build/lib/omc/libmsgpackc.a
 endif
 endif
-
 msgpack-clean:
 	test ! -f 3rdParty/msgpack-0.5.8/Makefile || $(MAKE) -C 3rdParty/msgpack-0.5.8 distclean || true
 	rm -f 3rdParty/msgpack-0.5.8/Makefile