Permalink
Browse files

fcoe-utils: Rename fcoe_utils.h to fcoe_utils_version.h

This patch renames the current fcoe_utils.h to fcoe_utils_version.h.

A later patch will create fcoe_utils.[ch] as common code between
all fcoe-utils applications.

Signed-off-by: Robert Love <robert.w.love@intel.com>
  • Loading branch information...
1 parent 5e75618 commit 4793d21242ecda5bce955a5c676ab95caa2632bf Rob Love committed Feb 20, 2010
Showing with 15 additions and 15 deletions.
  1. +1 −1 .gitignore
  2. +3 −3 Makefile.am
  3. +1 −1 configure.ac
  4. +0 −6 fcoe_utils.h.in
  5. +6 −0 fcoe_utils_version.h.in
  6. +1 −1 fcoeadm.c
  7. +1 −1 fcoemon.c
  8. +2 −2 fipvlan.c
View
@@ -15,7 +15,7 @@ missing
# other autoconf generated files
fcoe-utils.spec
fcoeplumb
-fcoe_utils.h
+fcoe_utils_version.h
# compile generated files
*.o
View
@@ -12,7 +12,7 @@ AM_CFLAGS = -DSYSCONFDIR="\"${sysconfdir}\""
## rules for building fcoeadm
## only listed sources get packaged, so must list all headers too
-fcoeadm_SOURCES = fcoeadm_display.c fcoeadm.c fcoeadm.h fcoe_utils.h \
+fcoeadm_SOURCES = fcoeadm_display.c fcoeadm.c fcoeadm.h fcoe_utils_version.h \
include/fc_scsi.h include/fc_types.h include/net_types.h fcoe_clif.c fcoe_clif.h
## fcoeadm uses HBAAPI, so get the right flags for compiling and linking
@@ -30,7 +30,7 @@ fcping_LDFLAGS = $(HBAAPI_LIBS) -lrt
## rules for building fcoemon
## only listed sources get packaged, so must list all headers too
fcoemon_SOURCES = fcoemon_utils.c fcoemon.c fcoemon.h fcoemon_utils.h \
-fcoe_utils.h include/fc_scsi.h include/fc_types.h include/net_types.h \
+fcoe_utils_version.h include/fc_scsi.h include/fc_types.h include/net_types.h \
fcoe_clif.c fcoe_clif.h
## fcoemon needs headers from dcbd, get the right include path for them
@@ -39,7 +39,7 @@ fcoemon_LDFLAGS = -lrt
## rules for building fipvlan
## only listed sources get packaged, so must list all headers too
-fipvlan_SOURCES = fipvlan.c fcoe_utils.h include/fip.h \
+fipvlan_SOURCES = fipvlan.c fcoe_utils_version.h include/fip.h \
log.c include/log.h include/list.h
## install configuration file in $(prefix)/etc/fcoe
View
@@ -19,6 +19,6 @@ AS_IF([test "X$with_dcb" != Xno],
[PKG_CHECK_MODULES([DCBD], [dcbd])
AC_SUBST([DCBD_CFLAGS])])
-AC_CONFIG_FILES([Makefile fcoe-utils.spec fcoe_utils.h])
+AC_CONFIG_FILES([Makefile fcoe-utils.spec fcoe_utils_version.h])
AC_OUTPUT
View
@@ -1,6 +0,0 @@
-#ifndef _FCOE_UTILS_H_
-#define _FCOE_UTILS_H_
-
-#define FCOE_UTILS_VERSION "@VERSION@"
-
-#endif /* _FCOE_UTILS_H_ */
View
@@ -0,0 +1,6 @@
+#ifndef _FCOE_UTILS_VERSION_H_
+#define _FCOE_UTILS_VERSION_H_
+
+#define FCOE_UTILS_VERSION "@VERSION@"
+
+#endif /* _FCOE_UTILS_VERSION_H_ */
View
@@ -22,7 +22,7 @@
#endif
#include <libgen.h>
#include <paths.h>
-#include "fcoe_utils.h"
+#include "fcoe_utils_version.h"
#include "fcoeadm.h"
#include "fcoe_clif.h"
View
@@ -56,7 +56,7 @@
#include "net_types.h"
#include "fc_types.h"
-#include "fcoe_utils.h"
+#include "fcoe_utils_version.h"
#include "fcoemon_utils.h"
#include "fcoemon.h"
#include "fcoe_clif.h"
View
@@ -1,5 +1,5 @@
/*
- * Copyright(c) 2009 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010 Intel Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
@@ -36,7 +36,7 @@
#include <arpa/inet.h>
#include <linux/netlink.h>
#include <linux/rtnetlink.h>
-#include "fcoe_utils.h"
+#include "fcoe_utils_version.h"
#include "fip.h"
#include "log.h"
#include "list.h"

0 comments on commit 4793d21

Please sign in to comment.