Mercurial Mercurial > etherlabmaster / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | zip | gz | help
rtdm skin is equivalent to posix in Xenomai3's xeno-config. Replace XENOMAI_RTDM_*FLAGS by XENOMAI_LIB_*FLAGS to distinguish lib/example flags. stable-1.5
authorEdouard Tisserant <edouard.tisserant@gmail.com>
Sun, 22 Jul 2018 23:17:59 +0200
branchstable-1.5
changeset 2702 c67a3647891d
parent 2701 00a6a77face6
child 2703 045624f7f4c3
rtdm skin is equivalent to posix in Xenomai3's xeno-config. Replace XENOMAI_RTDM_*FLAGS by XENOMAI_LIB_*FLAGS to distinguish lib/example flags.
configure.ac file | annotate | diff | comparison | revisions
examples/xenomai/Makefile.am file | annotate | diff | comparison | revisions
examples/xenomai_posix/Makefile.am file | annotate | diff | comparison | revisions
lib/Makefile.am file | annotate | diff | comparison | revisions 
--- a/configure.ac	Tue Jul 10 16:49:05 2018 +0200
+++ b/configure.ac	Sun Jul 22 23:17:59 2018 +0200
@@ -664,12 +664,12 @@
     fi
     AC_MSG_RESULT([$xenomaidir])
 
-    xeno_native_cflags=`$xenomaiconfig --skin native --cflags`
-    xeno_native_ldflags=`$xenomaiconfig --skin native --ldflags`
-    xeno_posix_cflags=`$xenomaiconfig --skin posix --cflags`
-    xeno_posix_ldflags=`$xenomaiconfig --skin posix --ldflags`
-    xeno_rtdm_cflags=`$xenomaiconfig --skin rtdm --cflags`
-    xeno_rtdm_ldflags=`$xenomaiconfig --skin rtdm --ldflags`
+    xeno_native_cflags=`$xenomaiconfig --alchemy --cflags`
+    xeno_native_ldflags=`$xenomaiconfig --alchemy --ldflags`
+    xeno_posix_cflags=`$xenomaiconfig --posix --cflags`
+    xeno_posix_ldflags=`$xenomaiconfig --posix --ldflags`
+    xeno_lib_cflags=`$xenomaiconfig --posix --cflags`
+    xeno_lib_ldflags=`$xenomaiconfig --no-auto-init --ldflags`
 fi
 
 AC_SUBST(XENOMAI_DIR,[$xenomaidir])
@@ -680,8 +680,8 @@
 AC_SUBST(XENOMAI_NATIVE_LDFLAGS,[$xeno_native_ldflags])
 AC_SUBST(XENOMAI_POSIX_CFLAGS,[$xeno_posix_cflags])
 AC_SUBST(XENOMAI_POSIX_LDFLAGS,[$xeno_posix_ldflags])
-AC_SUBST(XENOMAI_RTDM_CFLAGS,[$xeno_rtdm_cflags])
-AC_SUBST(XENOMAI_RTDM_LDFLAGS,[$xeno_rtdm_ldflags])
+AC_SUBST(XENOMAI_LIB_CFLAGS,[$xeno_lib_cflags])
+AC_SUBST(XENOMAI_LIB_LDFLAGS,[$xeno_lib_ldflags])
 
 #------------------------------------------------------------------------------
 # RTDM interface (optional)
--- a/examples/xenomai/Makefile.am	Tue Jul 10 16:49:05 2018 +0200
+++ b/examples/xenomai/Makefile.am	Sun Jul 22 23:17:59 2018 +0200
@@ -34,12 +34,10 @@
 ec_xenomai_example_CFLAGS = \
 	-Wall \
 	-I$(top_srcdir)/include \
-	$(XENOMAI_NATIVE_CFLAGS) \
-	$(XENOMAI_RTDM_CFLAGS)
+	$(XENOMAI_NATIVE_CFLAGS)
 
 ec_xenomai_example_LDFLAGS = \
 	-L$(top_builddir)/lib/.libs -lethercat_rtdm \
-	$(XENOMAI_NATIVE_LDFLAGS) \
-	$(XENOMAI_RTDM_LDFLAGS)
+	$(XENOMAI_NATIVE_LDFLAGS)
 
 #------------------------------------------------------------------------------
--- a/examples/xenomai_posix/Makefile.am	Tue Jul 10 16:49:05 2018 +0200
+++ b/examples/xenomai_posix/Makefile.am	Sun Jul 22 23:17:59 2018 +0200
@@ -34,12 +34,10 @@
 ec_xenomai_posix_example_CFLAGS = \
 	-Wall \
 	-I$(top_srcdir)/include \
-	$(XENOMAI_POSIX_CFLAGS) \
-	$(XENOMAI_RTDM_CFLAGS)
+	$(XENOMAI_POSIX_CFLAGS)
 
 ec_xenomai_posix_example_LDFLAGS = \
 	-L$(top_builddir)/lib/.libs -lethercat_rtdm \
-	$(XENOMAI_POSIX_LDFLAGS) \
-	$(XENOMAI_RTDM_LDFLAGS)
+	$(XENOMAI_POSIX_LDFLAGS)
 
 #------------------------------------------------------------------------------
--- a/lib/Makefile.am	Tue Jul 10 16:49:05 2018 +0200
+++ b/lib/Makefile.am	Sun Jul 22 23:17:59 2018 +0200
@@ -64,8 +64,8 @@
 libethercat_rtdm_la_LDFLAGS = $(libethercat_la_LDFLAGS)
 
 if ENABLE_XENOMAI
-libethercat_rtdm_la_CFLAGS += $(XENOMAI_RTDM_CFLAGS)
-libethercat_rtdm_la_LDFLAGS += $(XENOMAI_RTDM_LDFLAGS)
+libethercat_rtdm_la_CFLAGS += $(XENOMAI_LIB_CFLAGS)
+libethercat_rtdm_la_LDFLAGS += $(XENOMAI_LIB_LDFLAGS)
 endif
 
 if ENABLE_RTAI
etherlabmaster