[ofa-general] [PATCH] management/Makefile: remove obsolete .orig Makefile stuff
Sasha Khapyorsky
sashak at voltaire.com
Mon Oct 1 13:23:59 PDT 2007
Remove obsolete (and broken) Makefile.orig files
Signed-off-by: Sasha Khapyorsky <sashak at voltaire.com>
---
Makefile | 9 -------
libibcommon/Makefile.orig | 19 ---------------
libibmad/Makefile.orig | 19 ---------------
libibumad/Makefile.orig | 19 ---------------
make.inc.orig | 38 -------------------------------
make.rules | 54 ---------------------------------------------
6 files changed, 0 insertions(+), 158 deletions(-)
delete mode 100644 libibcommon/Makefile.orig
delete mode 100644 libibmad/Makefile.orig
delete mode 100644 libibumad/Makefile.orig
delete mode 100644 make.inc.orig
delete mode 100644 make.rules
diff --git a/Makefile b/Makefile
index 01466a2..957b1fe 100644
--- a/Makefile
+++ b/Makefile
@@ -11,15 +11,6 @@ all: BUILD_TARG=all
all: libs_install subdirs
@echo Make all done
-.PHONY : svnclean
-svnclean:
- svn st --no-ignore | awk '/^[\?I]/{print $$2}' | xargs rm -rf
-
-.PHONY : origmake
-origmake:
- for i in `find . -name Makefile.orig`; do cp $$i `echo $$i | sed 's/.orig$$//'`; done
-
-.PHONY : orig
automake:
@for i in $(LIBS); do \
if [ -x $$i/autogen.sh ]; then \
diff --git a/libibcommon/Makefile.orig b/libibcommon/Makefile.orig
deleted file mode 100644
index 0e7f013..0000000
--- a/libibcommon/Makefile.orig
+++ /dev/null
@@ -1,19 +0,0 @@
-OPENIB_ROOT=..
-include $(OPENIB_ROOT)/make.inc
-
-SRCS:=$(wildcard src/*.c)
-LIB_OBJS:=$(SRCS:.c=.lo)
-LIB_HDRS=$(wildcard include/infiniband/*.h)
-
-PUBLIC_HEADERS=include/infiniband/common.h
-
-#LIB_STATIC_TARGET=libibcommon.a
-LIB_SO_TARGET=libibcommon.la
-
-EXTRA_CLEAN=
-
-all: .depend $(LIB_SO_TARGET) #$(LIB_STATIC_TARGET)
-
-install: lib_install public_headers_install
-
-include $(OPENIB_ROOT)/make.rules
diff --git a/libibmad/Makefile.orig b/libibmad/Makefile.orig
deleted file mode 100644
index f9fe218..0000000
--- a/libibmad/Makefile.orig
+++ /dev/null
@@ -1,19 +0,0 @@
-OPENIB_ROOT=..
-include $(OPENIB_ROOT)/make.inc
-
-SRCS=$(wildcard src/*.c)
-LIB_OBJS=$(SRCS:.c=.lo)
-LIB_HDRS=$(wildcard include/infiniband/*.h)
-
-PUBLIC_HEADERS=include/infiniband/mad.h
-
-#LIB_STATIC_TARGET=libibmad.a
-LIB_SO_TARGET=libibmad.la
-
-EXTRA_CLEAN=
-
-all: .depend $(LIB_SO_TARGET) #$(LIB_STATIC_TARGET)
-
-install: lib_install public_headers_install
-
-include $(OPENIB_ROOT)/make.rules
diff --git a/libibumad/Makefile.orig b/libibumad/Makefile.orig
deleted file mode 100644
index 8ce1481..0000000
--- a/libibumad/Makefile.orig
+++ /dev/null
@@ -1,19 +0,0 @@
-OPENIB_ROOT=..
-include $(OPENIB_ROOT)/make.inc
-
-SRCS=$(wildcard src/*.c)
-LIB_OBJS=$(SRCS:.c=.lo)
-LIB_HDRS=$(wildcard include/infiniband/*.h) ../libibcommon/include/infiniband/common.h
-
-PUBLIC_HEADERS=include/infiniband/umad.h
-
-#LIB_STATIC_TARGET=libibumad.a
-LIB_SO_TARGET=libibumad.la
-
-EXTRA_CLEAN=
-
-all: $(LIB_SO_TARGET)
-
-install: lib_install public_headers_install
-
-include $(OPENIB_ROOT)/make.rules
diff --git a/make.inc.orig b/make.inc.orig
deleted file mode 100644
index 7d6e203..0000000
--- a/make.inc.orig
+++ /dev/null
@@ -1,38 +0,0 @@
-#################################
-# Openib usermode common make file variables
-#
-
-# OPENIB_ROOT: root of OPENIB usermode management src tree - should be set by any makefile
-#OPENIB_ROOT=.
-
-# OPENIB_USR_INC: common usermode includes
-OPENIB_USR_INC=/usr/local/include/infiniband
-
-# OPENIB_USR_INSTALL: root directory for target installation directories
-OPENIB_USR_INSTALL=/usr/local/ib
-
-# OPENIB_USR_BIN: binaries install target
-OPENIB_USR_BIN=$(OPENIB_USR_INSTALL)/bin
-
-# OPENIB_USR_LIB: libraries install target
-OPENIB_USR_LIB=$(OPENIB_USR_INSTALL)/lib
-
-BUILD_VERS:=$(shell svn info Makefile | awk '/^Revision/{print $$0;exit 0}' 2> /dev/null)
-
-# Common CFLAGS
-CFLAGS+= -I$(OPENIB_ROOT)/libibcommon/include/infiniband \
- -I$(OPENIB_ROOT)/libibmad/include/infiniband \
- -I$(OPENIB_ROOT)/libibumad/include/infiniband
-CFLAGS+= -Wall -ggdb
-LDFLAGS=-L$(OPENIB_USR_LIB)
-ifneq ($(BUILD_VERS),)
- CFLAGS+= -D__BUILD_VERSION_TAG__="$(BUILD_VERS)"
-endif
-
-LD_SO_FLAGS=-g -rpath $(OPENIB_USR_LIB) -lm
-LD_STATIC_FLAGS=-g -O
-
-# common application
-CC=gcc
-LD=gcc
-INSTALL=install
diff --git a/make.rules b/make.rules
deleted file mode 100644
index 02c1b1d..0000000
--- a/make.rules
+++ /dev/null
@@ -1,54 +0,0 @@
-ifeq ($(shell sh -c "test -f .depend && echo yes"),yes)
-include .depend
-endif
-
-_C_SRCS:=$(BIN_OBJS:.o=.c)$(LIB_OBJS:.lo=.c)
-export _C_SRCS
-
-$(BIN_TARGET): .depend $(BIN_OBJS) $(BIN_HDRS) $(LIB_HDRS)
- libtool --mode=link $(LD) $(LDFLAGS) $(BIN_OBJS) $(BIN_LIBS) -o $@
-
-$(LIB_STATIC_TARGET): .depend $(LIB_OBJS) $(LIB_HDRS)
- libtool --mode=link $(LD) $(LD_STATIC_FLAGS) $(LIB_OBJS) -o $@
-
-$(LIB_SO_TARGET): .depend $(LIB_OBJS) $(LIB_HDRS)
- libtool --mode=link $(LD) $(LD_SO_FLAGS) $(LIB_OBJS) -o $@
-
-lib_install: $(LIB_SO_TARGET) $(LIB_STATIC_TARGET)
- $(INSTALL) -d $(OPENIB_USR_LIB)
- libtool --quiet --mode=install $(INSTALL) $(LIB_SO_TARGET) $(LIB_STATIC_TARGET) $(OPENIB_USR_LIB)
- libtool --quiet --mode=finish $(OPENIB_USR_LIB)
-
-public_headers_install:
- $(INSTALL) -d $(OPENIB_USR_INC)
- libtool --quiet --mode=install $(INSTALL) $(PUBLIC_HEADERS) $(OPENIB_USR_INC)
-
-bin_install: $(BIN_TARGET)
- $(INSTALL) -d $(OPENIB_USR_BIN)
- libtool --mode=install $(INSTALL) $(BIN_TARGET) $(OPENIB_USR_BIN)
-
-script_install:
- $(INSTALL) -d $(OPENIB_USR_BIN)
- $(INSTALL) $(SCRIPT_TARGET) $(OPENIB_USR_BIN)
-
-clean:
- libtool --mode=clean rm -f *.a *.o *.lo src/*.o src/*.lo $(BIN_TARGET) $(LIB_SO_TARGET) $(EXTRA_CLEAN) .depend
-
-.depend:
- @touch .depend
- @if ! [ "$$_C_SRCS" = "" ]; then\
- gcc -M $(CFLAGS) $(_C_SRCS) > .depend;\
- fi
- @echo `pwd`/.depend file created
-
-rmdep:
- rm -f .depend
-
-depend: .depend
-
-%.o: %.c
- libtool --mode=compile $(CC) -O -c $(CFLAGS) $< -o $@
-
-%.lo: %.c
- libtool --mode=compile $(CC) -O -c $(CFLAGS) $< -o $@
-
--
1.5.3.rc2.29.gc4640f
More information about the general
mailing list