[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.03-3-ge879971



This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=e879971090c6821bb966f17875874d11aa740a5c

The branch, master has been updated
       via  e879971090c6821bb966f17875874d11aa740a5c (commit)
      from  db9e98c6e7f6cf7681a1e6b10d9029214027f8ea (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e879971090c6821bb966f17875874d11aa740a5c
Author: Fabio M. Di Nitto <fdinitto redhat com>
Date:   Tue Jun 3 07:54:37 2008 +0200

    [MISC] Make several API's private again
    
    A bunch of API's have been exported and made public by mistake.
    
    libdlmcontrol, libfenced and libgfscontrol are now private again
    and no shared libraries are available.
    
    Make sure to uninstall the shared libraries from your system
    as they are not used anylonger.
    
    NOTE: make sure to clean your tree before you git pull and
    then re-configure (optional to get rid of old build variables).
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto redhat com>

-----------------------------------------------------------------------

Summary of changes:
 configure                    |   42 ------------------------------------------
 dlm/libdlmcontrol/Makefile   |   19 +------------------
 dlm/tool/Makefile            |    7 ++++---
 fence/fence_node/Makefile    |    7 ++++---
 fence/fence_tool/Makefile    |    7 ++++---
 fence/fenced/Makefile        |    5 ++---
 fence/libfenced/Makefile     |   19 +------------------
 gfs2/mount/Makefile          |    6 ++++--
 group/dlm_controld/Makefile  |    8 ++++----
 group/gfs_control/Makefile   |    5 ++---
 group/gfs_controld/Makefile  |    8 ++++----
 group/libgfscontrol/Makefile |   20 +-------------------
 make/defines.mk.input        |    6 ------
 13 files changed, 31 insertions(+), 128 deletions(-)

diff --git a/configure b/configure
index c2b648d..871639a 100755
--- a/configure
+++ b/configure
@@ -52,14 +52,8 @@ my %options = (
 	cmanlibdir => \$cmanlibdir,
 	dlmincdir => \$dlmincdir,
 	dlmlibdir => \$dlmlibdir,
-	dlmcontrolincdir => \$dlmcontrolincdir,
-	dlmcontrollibdir => \$dlmcontrollibdir,
-	gfscontrolincdir => \$gfscontrolincdir,
-	gfscontrollibdir => \$gfscontrollibdir,
 	fenceincdir => \$fenceincdir,
 	fencelibdir => \$fencelibdir,
-	fencedincdir => \$fenceincdir,
-	fencedlibdir => \$fencelibdir,
 	volidincdir => \$volidincdir,
 	volidlibdir => \$volidlibdir,
 	ncursesincdir => \$ncursesincdir,
@@ -133,14 +127,8 @@ my $err = &GetOptions (\%options,
 		    'cmanlibdir=s',
 		    'dlmincdir=s',
 		    'dlmlibdir=s',
-		    'dlmcontrolincdir=s',
-		    'dlmcontrollibdir=s',
-		    'gfscontrolincdir=s',
-		    'gfscontrollibdir=s',
 		    'fenceincdir=s',
 		    'fencelibdir=s',
-		    'fencedincdir=s',
-		    'fencedlibdir=s',
 		    'volidincdir=s',
 		    'volidlibdir=s',
 		    'ncursesincdir=s',
@@ -234,14 +222,8 @@ if ($help || !$err) {
   print "--cmanlibdir=\tthe base directory for cman libraries.  (Default: ./cman/lib)\n";
   print "--dlmincdir=\tthe base directory for dlm include files.  (Default: ./dlm/libdlm)\n";
   print "--dlmlibdir=\tthe base directory for dlm libraries.  (Default: ./dlm/libdlm)\n";
-  print "--dlmcontrolincdir=\tthe base directory for dlmcontrol include files.  (Default: ./dlm/libdlmcontrol)\n";
-  print "--dlmcontrollibdir=\tthe base directory for dlmcontrol libraries.  (Default: ./dlm/libdlmcontrol)\n";
-  print "--gfscontrolincdir=\tthe base directory for gfscontrol include files.  (Default: ./group/libgfscontrol)\n";
-  print "--gfscontrollibdir=\tthe base directory for gfscontrol libraries.  (Default: ./group/libgfscontrol)\n";
   print "--fenceincdir=\tthe base directory for fence include files.  (Default: ./fence/libfence)\n";
   print "--fencelibdir=\tthe base directory for fence libraries.  (Default: ./fence/libfence)\n";
-  print "--fencedincdir=\tthe base directory for fenced include files.  (Default: ./fence/libfenced)\n";
-  print "--fencedlibdir=\tthe base directory for fenced libraries.  (Default: ./fence/libfenced)\n";
   print "--volidincdir=\tthe base directory for volume_id include files.  (Default: {incdir})\n";
   print "--volidlibdir=\tthe base directory for volume_id libraries.  (Default: {libdir})\n";
   print "--ncursesincdir=\tthe base directory for ncurses include files.  (Default: {incdir})\n";
@@ -445,30 +427,12 @@ if (!$dlmincdir) {
 if (!$dlmlibdir) {
   $dlmlibdir="${objdir}/dlm/libdlm";
 }
-if (!$dlmcontrolincdir) {
-  $dlmcontrolincdir="${cdir}/dlm/libdlmcontrol";
-}
-if (!$dlmcontrollibdir) {
-  $dlmcontrollibdir="${objdir}/dlm/libdlmcontrol";
-}
-if (!$gfscontrolincdir) {
-  $gfscontrolincdir="${cdir}/group/libgfscontrol";
-}
-if (!$gfscontrollibdir) {
-  $gfscontrollibdir="${objdir}/group/libgfscontrol";
-}
 if (!$fenceincdir) {
   $fenceincdir="${cdir}/fence/libfence";
 }
 if (!$fencelibdir) {
   $fencelibdir="${objdir}/fence/libfence";
 }
-if (!$fencedincdir) {
-  $fencedincdir="${cdir}/fence/libfenced";
-}
-if (!$fencedlibdir) {
-  $fencedlibdir="${objdir}/fence/libfenced";
-}
 if (!$volidincdir) {
   $volidincdir="${incdir}";
 }
@@ -673,14 +637,8 @@ while (<IFILE>) {
   $_ =~ s/\ CMANLIBDIR\@/$cmanlibdir/;
   $_ =~ s/\ DLMINCDIR\@/$dlmincdir/;
   $_ =~ s/\ DLMLIBDIR\@/$dlmlibdir/;
-  $_ =~ s/\ DLMCONTROLINCDIR\@/$dlmcontrolincdir/;
-  $_ =~ s/\ DLMCONTROLLIBDIR\@/$dlmcontrollibdir/;
-  $_ =~ s/\ GFSCONTROLINCDIR\@/$gfscontrolincdir/;
-  $_ =~ s/\ GFSCONTROLLIBDIR\@/$gfscontrollibdir/;
   $_ =~ s/\ FENCEINCDIR\@/$fenceincdir/;
   $_ =~ s/\ FENCELIBDIR\@/$fencelibdir/;
-  $_ =~ s/\ FENCEDINCDIR\@/$fencedincdir/;
-  $_ =~ s/\ FENCEDLIBDIR\@/$fencedlibdir/;
   $_ =~ s/\ VOLIDINCDIR\@/$volidincdir/;
   $_ =~ s/\ VOLIDLIBDIR\@/$volidlibdir/;
   $_ =~ s/\ READLINEINCDIR\@/$readlineincdir/;
diff --git a/dlm/libdlmcontrol/Makefile b/dlm/libdlmcontrol/Makefile
index 30447f3..d7c96b7 100644
--- a/dlm/libdlmcontrol/Makefile
+++ b/dlm/libdlmcontrol/Makefile
@@ -12,21 +12,9 @@
 
 TARGET= libdlmcontrol
 
-LIBDIRT=$(TARGET).a \
-	$(TARGET).so.$(SOMAJOR).$(SOMINOR)
-
-LIBSYMT=$(TARGET).so \
-	$(TARGET).so.$(SOMAJOR)
-
-INCDIRT=$(TARGET).h
+all: $(TARGET).a
 
 include ../../make/defines.mk
-
-SHAREDLIB=$(TARGET).so.${SOMAJOR}.${SOMINOR}
-STATICLIB=$(TARGET).a
-
-all: $(STATICLIB) $(SHAREDLIB)
-
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
 include $(OBJDIR)/make/install.mk
@@ -43,11 +31,6 @@ $(TARGET).a: $(OBJS)
 	${AR} r $@ $^
 	${RANLIB} $@
 
-$(TARGET).so.${SOMAJOR}.${SOMINOR}: $(OBJS)
-	$(CC) -shared -o $@ -Wl,-soname=$(TARGET).so.$(SOMAJOR) $< $(LDFLAGS)
-	ln -sf $(TARGET).so.$(SOMAJOR).$(SOMINOR) $(TARGET).so
-	ln -sf $(TARGET).so.$(SOMAJOR).$(SOMINOR) $(TARGET).so.$(SOMAJOR)
-
 clean: generalclean
 
 -include $(OBJS:.o=.d)
diff --git a/dlm/tool/Makefile b/dlm/tool/Makefile
index 6612672..491565d 100644
--- a/dlm/tool/Makefile
+++ b/dlm/tool/Makefile
@@ -24,13 +24,14 @@ include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	main.o
 
-CFLAGS += -I${dlmincdir} -I${dlmcontrolincdir}
+CFLAGS += -I${dlmincdir} 
+CFLAGS += -I$(S)/../libdlmcontrol
 CFLAGS += -I$(SRCDIR)/group/dlm_controld/
 CFLAGS += -I${incdir}
 CFLAGS += -I${KERNEL_SRC}/include/
 
-LDFLAGS += -L${dlmlibdir} -L${dlmcontrollibdir} -ldlm -ldlmcontrol
-
+LDFLAGS += -L${dlmlibdir} -ldlm 
+LDFLAGS += -L../libdlmcontrol -ldlmcontrol
 
 ${TARGET}: ${OBJS}
 	$(CC) -o $@ $^ $(LDFLAGS)
diff --git a/fence/fence_node/Makefile b/fence/fence_node/Makefile
index 307834d..a30c79c 100644
--- a/fence/fence_node/Makefile
+++ b/fence/fence_node/Makefile
@@ -27,11 +27,12 @@ OBJS=	fence_node.o
 
 CFLAGS += -D_FILE_OFFSET_BITS=64
 
-CFLAGS += -I${ccsincdir} -I${fenceincdir} -I${fencedincdir}
-CFLAGS += -I../include
+CFLAGS += -I${ccsincdir} -I${fenceincdir}
+CFLAGS += -I$(S)/../libfenced
 CFLAGS += -I${incdir}
 
-LDFLAGS += -L${ccslibdir} -L${fencelibdir} -L${fencedlibdir} -lccs -lfence -lfenced
+LDFLAGS += -L${ccslibdir} -L${fencelibdir} -lccs -lfence
+LDFLAGS += -L../libfenced -lfenced
 
 ${TARGET}: ${OBJS}
 	$(CC) -o $@ $^ $(LDFLAGS)
diff --git a/fence/fence_tool/Makefile b/fence/fence_tool/Makefile
index c3b1a22..d64fd4c 100644
--- a/fence/fence_tool/Makefile
+++ b/fence/fence_tool/Makefile
@@ -26,11 +26,12 @@ include $(OBJDIR)/make/uninstall.mk
 OBJS=fence_tool.o
 
 CFLAGS += -D_FILE_OFFSET_BITS=64
-CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${fencedincdir}
-CFLAGS += -I$(S)/../include
+CFLAGS += -I${ccsincdir} -I${cmanincdir}
+CFLAGS += -I$(S)/../libfenced -I$(S)/../include
 CFLAGS += -I${incdir} 
 
-LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -L${fencedlibdir} -lccs -lcman -lfenced
+LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
+LDFLAGS += -L../libfenced -lfenced
 
 ${TARGET}: ${OBJS}
 	$(CC) -o $@ $^ $(LDFLAGS)
diff --git a/fence/fenced/Makefile b/fence/fenced/Makefile
index 4104842..9fbfaa4 100644
--- a/fence/fenced/Makefile
+++ b/fence/fenced/Makefile
@@ -31,9 +31,8 @@ OBJS=	config.o \
 	recover.o
 
 CFLAGS += -D_FILE_OFFSET_BITS=64
-CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${fenceincdir} -I${fencedincdir}
-CFLAGS += -I${openaisincdir}
-CFLAGS += -I$(S) -I$(S)/../include -I$(SRCDIR)/group/lib
+CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${fenceincdir} -I${openaisincdir}
+CFLAGS += -I$(S) -I$(S)/../include -I$(S)/../libfenced -I$(SRCDIR)/group/lib
 CFLAGS += -I${incdir}
 
 LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -L${openaislibdir} -lccs -lcman -lcpg
diff --git a/fence/libfenced/Makefile b/fence/libfenced/Makefile
index 2191f1f..a01062c 100644
--- a/fence/libfenced/Makefile
+++ b/fence/libfenced/Makefile
@@ -12,21 +12,9 @@
 
 TARGET= libfenced
 
-LIBDIRT=$(TARGET).a \
-	$(TARGET).so.$(SOMAJOR).$(SOMINOR)
-
-LIBSYMT=$(TARGET).so \
-	$(TARGET).so.$(SOMAJOR)
-
-INCDIRT=$(TARGET).h
+all: $(TARGET).a
 
 include ../../make/defines.mk
-
-SHAREDLIB=$(TARGET).so.${SOMAJOR}.${SOMINOR}
-STATICLIB=$(TARGET).a
-
-all: $(STATICLIB) $(SHAREDLIB)
-
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
 include $(OBJDIR)/make/install.mk
@@ -42,11 +30,6 @@ $(TARGET).a: $(OBJS)
 	${AR} r $@ $^
 	${RANLIB} $@
 
-$(TARGET).so.${SOMAJOR}.${SOMINOR}: $(OBJS)
-	$(CC) -shared -o $@ -Wl,-soname=$(TARGET).so.$(SOMAJOR) $< $(LDFLAGS)
-	ln -sf $(TARGET).so.$(SOMAJOR).$(SOMINOR) $(TARGET).so
-	ln -sf $(TARGET).so.$(SOMAJOR).$(SOMINOR) $(TARGET).so.$(SOMAJOR)
-
 clean: generalclean
 
 -include $(OBJS:.o=.d)
diff --git a/gfs2/mount/Makefile b/gfs2/mount/Makefile
index 0c1b73b..739c829 100644
--- a/gfs2/mount/Makefile
+++ b/gfs2/mount/Makefile
@@ -26,11 +26,13 @@ OBJS1=	mount.gfs2.o \
 CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 CFLAGS += -I${gfskincdir}
 CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
-CFLAGS += -I${gfscontrolincdir}
+CFLAGS += -I$(SRCDIR)/group/libgfscontrol
 CFLAGS += -I$(S)/../include
 CFLAGS += -I${incdir}
 
-${TARGET1}: ${OBJS1} ${gfscontrollibdir}/libgfscontrol.a
+LDFLAGS += -L../../group/libgfscontrol -lgfscontrol
+
+${TARGET1}: ${OBJS1}
 	$(CC) -o $@ $^ $(LDFLAGS)
 
 install: all
diff --git a/group/dlm_controld/Makefile b/group/dlm_controld/Makefile
index 7c4f263..c4bda25 100644
--- a/group/dlm_controld/Makefile
+++ b/group/dlm_controld/Makefile
@@ -33,17 +33,17 @@ OBJS=	action.o \
 	plock.o \
 	group.o
 
-CFLAGS += -I${ccsincdir} -I${cmanincdir} 
-CFLAGS += -I${dlmincdir} -I${dlmcontrolincdir}
-CFLAGS += -I${openaisincdir} -I${fencedincdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir}
+CFLAGS += -I${openaisincdir}
+CFLAGS += -I$(SRCDIR)/dlm/libdlmcontrol/ -I$(SRCDIR)/fence/libfenced/
 CFLAGS += -I${KERNEL_SRC}/include/
 CFLAGS += -I$(S)/../lib/ -I$(S)/../include/
 CFLAGS += -I${incdir}
 
 LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
 LDFLAGS += -L${dlmlibdir} -ldlm 
-LDFLAGS += -L${fencedlibdir} -lfenced
 LDFLAGS += -L${openaislibdir} -lcpg -lSaCkpt
+LDFLAGS += -L../../fence/libfenced/ -lfenced
 LDFLAGS += -L../lib -lgroup -lpthread
 
 
diff --git a/group/gfs_control/Makefile b/group/gfs_control/Makefile
index 04f73ab..e7a5bc7 100644
--- a/group/gfs_control/Makefile
+++ b/group/gfs_control/Makefile
@@ -24,11 +24,10 @@ include $(OBJDIR)/make/uninstall.mk
 
 OBJS=	main.o
 
-CFLAGS += -I${gfscontrolincdir}
+CFLAGS += -I$(S)/../libgfscontrol
 CFLAGS += -I${incdir}
-CFLAGS += -I${KERNEL_SRC}/include/
 
-LDFLAGS += -L${gfscontrollibdir} -lgfscontrol
+LDFLAGS += -L../libgfscontrol -lgfscontrol
 
 ${TARGET}: ${OBJS}
 	$(CC) -o $@ $^ $(LDFLAGS)
diff --git a/group/gfs_controld/Makefile b/group/gfs_controld/Makefile
index 37f78f4..4a55a0a 100644
--- a/group/gfs_controld/Makefile
+++ b/group/gfs_controld/Makefile
@@ -30,16 +30,16 @@ OBJS= 	main.o \
 	util.o \
 	plock.o
 
-CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${fencedincdir}
-CFLAGS += -I${gfscontrolincdir} -I${openaisincdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${openaisincdir}
+CFLAGS += -I${openaisincdir}
 CFLAGS += -I${KERNEL_SRC}/include/
+CFLAGS += -I$(S)/../libgfscontrol -I$(S)/../../fence/libfenced/
 CFLAGS += -I$(S)/../lib/ -I$(S)/../include/
 CFLAGS += -I${incdir}
 
 LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lcman -lccs
-LDFLAGS += -L${fencedlibdir} -lfenced
 LDFLAGS += -L${openaislibdir} -lcpg -lSaCkpt
-LDFLAGS += -L${libdir}
+LDFLAGS += -L../../fence/libfenced/ -lfenced
 LDFLAGS += -L../lib -lgroup
 
 
diff --git a/group/libgfscontrol/Makefile b/group/libgfscontrol/Makefile
index 40d12d6..451848a 100644
--- a/group/libgfscontrol/Makefile
+++ b/group/libgfscontrol/Makefile
@@ -12,21 +12,9 @@
 
 TARGET= libgfscontrol
 
-LIBDIRT=$(TARGET).a \
-	$(TARGET).so.$(SOMAJOR).$(SOMINOR)
-
-LIBSYMT=$(TARGET).so \
-	$(TARGET).so.$(SOMAJOR)
-
-INCDIRT=$(TARGET).h
+all: $(TARGET).a
 
 include ../../make/defines.mk
-
-SHAREDLIB=$(TARGET).so.${SOMAJOR}.${SOMINOR}
-STATICLIB=$(TARGET).a
-
-all: $(STATICLIB) $(SHAREDLIB)
-
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
 include $(OBJDIR)/make/install.mk
@@ -37,17 +25,11 @@ OBJS=	main.o
 CFLAGS += -fPIC
 CFLAGS += -I$(S)/../../group/gfs_controld
 CFLAGS += -I${incdir}
-CFLAGS += -I$(KERNEL_SRC)/include
 
 $(TARGET).a: $(OBJS)
 	${AR} r $@ $^
 	${RANLIB} $@
 
-$(TARGET).so.${SOMAJOR}.${SOMINOR}: $(OBJS)
-	$(CC) -shared -o $@ -Wl,-soname=$(TARGET).so.$(SOMAJOR) $< $(LDFLAGS)
-	ln -sf $(TARGET).so.$(SOMAJOR).$(SOMINOR) $(TARGET).so
-	ln -sf $(TARGET).so.$(SOMAJOR).$(SOMINOR) $(TARGET).so.$(SOMAJOR)
-
 clean: generalclean
 
 -include $(OBJS:.o=.d)
diff --git a/make/defines.mk.input b/make/defines.mk.input
index b1f7b66..cfd9a9d 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -49,14 +49,8 @@ cmanincdir ?= @CMANINCDIR@
 cmanlibdir ?= @CMANLIBDIR@
 dlmincdir ?= @DLMINCDIR@
 dlmlibdir ?= @DLMLIBDIR@
-dlmcontrolincdir ?= @DLMCONTROLINCDIR@
-dlmcontrollibdir ?= @DLMCONTROLLIBDIR@
-gfscontrolincdir ?= @GFSCONTROLINCDIR@
-gfscontrollibdir ?= @GFSCONTROLLIBDIR@
 fenceincdir ?= @FENCEINCDIR@
 fencelibdir ?= @FENCELIBDIR@
-fencedincdir ?= @FENCEDINCDIR@
-fencedlibdir ?= @FENCEDLIBDIR@
 volidincdir ?= @VOLIDINCDIR@
 volidlibdir ?= @VOLIDLIBDIR@
 readlineincdir ?= @READLINEINCDIR@


hooks/post-receive
--
Cluster Project


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]