Fixed compilation issues with SCHED_DEADLINE. Still missing complete support

7 files changed, 16 insertions, 17 deletions

diff --git a/.bzrignore b/.bzrignore
index c2165aa..fb4c618 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -25,4 +25,3 @@ src/rt-app
 ./README
 rt-app-**.tar.**
 dist
-./libdl
diff --git a/Makefile.am b/Makefile.am
index af437a6..3e4d129 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1 @@
-SUBDIRS = src
+SUBDIRS = libdl src
diff --git a/configure.ac b/configure.ac
index 2d3c597..042ed88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,15 +29,15 @@ AC_ARG_WITH([aquosa],
               [-lqreslib])])
 
 AC_ARG_WITH([deadline],
-	[AS_HELP_STRING([--enable-deadline], 
+	[AS_HELP_STRING([--with-deadline], 
          [Add support for SCHED_DEADLINE])],
 	[],
 	[with_deadline=no])
 LIBQRESLIB=
 AS_IF([test "x$with_deadline" != xno],
-	[AC_DEFINE([DEADLINE], [1], [Define if you have SCHED_DEADLINE support])
+	[AC_DEFINE([DLSCHED], [1], [Define if you have SCHED_DEADLINE support])
      ])
 
 AC_CONFIG_HEADERS([src/config.h])
-AC_CONFIG_FILES([Makefile src/Makefile README:README.in INSTALL:INSTALL.in])
+AC_CONFIG_FILES([Makefile src/Makefile libdl/Makefile README:README.in INSTALL:INSTALL.in])
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index 63bb8e2..d63f04f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
-
+AM_CPPFLAGS = -I$(srcdir)/../libdl/
 bin_PROGRAMS = rt-app
-rt_app_SOURCES= dl_syscalls.h rt-app_args.h rt-app_utils.h rt-app.h rt-app_types.h \
-		dl_syscalls.c rt-app_args.c rt-app_utils.c rt-app.c 
-rt_app_LDADD = $(QRESLIB)
+rt_app_SOURCES= rt-app_types.h rt-app_args.h rt-app_utils.h rt-app_utils.c rt-app_args.c rt-app.h  rt-app.c # dl_syscalls.c dl_syscalls.h 
+rt_app_LDADD = $(QRESLIB) ../libdl/libdl.a
+
diff --git a/src/rt-app.h b/src/rt-app.h
index f109af1..a8c0f20 100644
--- a/src/rt-app.h
+++ b/src/rt-app.h
@@ -31,9 +31,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <string.h>
 #include <signal.h>
 #include <sys/mman.h>  /* for memlock */
+#include "config.h"
 #include "rt-app_types.h"
 #include "rt-app_args.h"
-#include "config.h"
 
 #ifdef AQUOSA
 #include <aquosa/qres_lib.h>
diff --git a/src/rt-app_args.h b/src/rt-app_args.h
index b7609ed..6e2e6e8 100644
--- a/src/rt-app_args.h
+++ b/src/rt-app_args.h
@@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <stdio.h>
 #include <string.h>
 #include <sched.h>
-#include "rt-app_utils.h"
 #include "rt-app_types.h"
+#include "rt-app_utils.h"
 
 #define DEFAULT_THREAD_PRIORITY 10
 
diff --git a/src/rt-app_types.h b/src/rt-app_types.h
index 4721307..92a9815 100644
--- a/src/rt-app_types.h
+++ b/src/rt-app_types.h
@@ -20,18 +20,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #ifndef _RTAPP_TYPES_H_
 #define _RTAPP_TYPES_H_
 
+#include "config.h"
+#ifdef DLSCHED
+#include "dl_syscalls.h"
+#endif
 #include <sched.h>
 #include <time.h>
 #include <stdio.h>
 #include <sched.h>
-#include "config.h"
 #ifdef AQUOSA
 #include <aquosa/qres_lib.h>
 #endif /* AQUOSA */
 
-#ifdef DEADLINE
-#include "dl_syscalls.h"
-#endif
 
 typedef enum policy_t 
 { 
@@ -41,7 +41,7 @@ typedef enum policy_t
 #ifdef AQUOSA
 	, aquosa = 1000 
 #endif
-#ifdef DEADLINE
+#ifdef DLSCHED
 	, deadline = SCHED_DEADLINE
 #endif
 } policy_t;
@@ -68,7 +68,7 @@ struct thread_data {
 	qres_params_t params;
 #endif
 
-#ifdef DEADLINE
+#ifdef DLSCHED
 	struct sched_param_ex dl_params;
 #endif
 };