[DRBD-cvs] user by phil; This patch makes it a lot easier to comp...

drbd-user@lists.linbit.com drbd-user@lists.linbit.com
Wed, 24 Mar 2004 14:14:12 +0100 (CET)


DRBD CVS committal

Author  : phil
Project : drbd
Module  : user

Dir     : drbd/user


Modified Files:
      Tag: rel-0_7-branch
	Makefile drbdadm.h drbdsetup.c 


Log Message:
This patch makes it a lot easier to compile DRBD into the kernel.
-- You also need a small patch maintained by Kees Cook --
[This patch is also by Kees Cook, ugglified by me.]

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/user/Makefile,v
retrieving revision 1.7.2.13
retrieving revision 1.7.2.14
diff -u -3 -r1.7.2.13 -r1.7.2.14
--- Makefile	12 Jan 2004 19:49:41 -0000	1.7.2.13
+++ Makefile	24 Mar 2004 13:14:07 -0000	1.7.2.14
@@ -17,7 +17,7 @@
 # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
-CFLAGS = -c -Wall
+CFLAGS = -c -Wall -I../drbd
 CC = gcc
 
 all: drbdsetup drbdadm
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/user/Attic/drbdadm.h,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -3 -r1.1.2.17 -r1.1.2.18
--- drbdadm.h	11 Feb 2004 13:25:20 -0000	1.1.2.17
+++ drbdadm.h	24 Mar 2004 13:14:07 -0000	1.1.2.18
@@ -1,7 +1,7 @@
 #ifndef DRBDADM_H
 #define DRBDADM_H
 
-#include "../drbd_config.h"
+#include <linux/drbd_config.h>
 
 struct d_globals
 {
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/user/drbdsetup.c,v
retrieving revision 1.54.2.27
retrieving revision 1.54.2.28
diff -u -3 -r1.54.2.27 -r1.54.2.28
--- drbdsetup.c	10 Mar 2004 23:54:40 -0000	1.54.2.27
+++ drbdsetup.c	24 Mar 2004 13:14:07 -0000	1.54.2.28
@@ -38,7 +38,7 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
-#include "../drbd/drbd.h"
+#include <linux/drbd.h>
 #define _GNU_SOURCE
 #include <getopt.h>
 #include <stdlib.h>