Skip to content

Commit

Permalink
Removed the following line from all Makefiles that had it :
Browse files Browse the repository at this point in the history
include $(TOPDIR)/Test.make

Added the variable BIN_PROGRAMS to enable binariy installation.

Added the Makefiles :

programs/python_common/workfiles/Makefile
programs/python_common/Makefile
programs/buildkernel/Makefile

Added rules for truncate_direct to programs/extend_files/Makefile

Signed-off-by: Sunil Mushran <[email protected]>

Original-revision: 47
  • Loading branch information
Marcos Matsunaga authored and Joel Becker committed Aug 26, 2008
1 parent f3814c3 commit caea2af
Show file tree
Hide file tree
Showing 21 changed files with 51 additions and 20 deletions.
2 changes: 2 additions & 0 deletions programs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ SUBDIRS = \
aio_direct \
basic-dual-data \
bonnie \
buildkernel \
create_and_open \
create_files \
create_racer \
Expand All @@ -28,6 +29,7 @@ SUBDIRS = \
mmap_test \
multi_node_mmap \
parallel_timing \
python_common \
quick_appending_writes \
sendfiletest \
splice \
Expand Down
2 changes: 1 addition & 1 deletion programs/aio-stress/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ TOPDIR = ../..
include $(TOPDIR)/Preamble.make

TESTS = aio-stress
BIN_PROGRAMS = aio-stress

CFLAGS = -O2 -Wall -g
LDFLAGS += -laio -lpthread
Expand All @@ -15,5 +16,4 @@ DIST_FILES = $(SOURCES)
truncate: $(OBJECTS)
$(LINK)

include $(TOPDIR)/Test.make
include $(TOPDIR)/Postamble.make
3 changes: 2 additions & 1 deletion programs/aio_direct/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))

DIST_FILES = $(SOURCES)

BIN_PROGRAMS = partial_aio_direct

partial_aio_direct: $(OBJECTS)
$(LINK) -laio

include $(TOPDIR)/Test.make
include $(TOPDIR)/Postamble.make
3 changes: 2 additions & 1 deletion programs/create_and_open/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))

DIST_FILES = $(SOURCES)

BIN_PROGRAMS = create_and_open

create_and_open: $(OBJECTS)
$(LINK)

include $(TOPDIR)/Test.make
include $(TOPDIR)/Postamble.make
3 changes: 2 additions & 1 deletion programs/create_racer/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))

DIST_FILES = $(SOURCES)

BIN_PROGRAMS = create_racer

lvb_torture: $(OBJECTS)
$(LINK)

include $(TOPDIR)/Test.make
include $(TOPDIR)/Postamble.make
3 changes: 2 additions & 1 deletion programs/extend_and_write/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@ SOURCES = $(EXTEND_AND_WRITE_SOURCES) $(VERIFY_SOURCES)

DIST_FILES = $(SOURCES)

BIN_PROGRAMS = extend_and_write verify

extend_and_write: $(EXTEND_AND_WRITE_OBJECTS)
$(LINK)
verify: $(VERIFY_OBJECTS)
$(LINK)

include $(TOPDIR)/Test.make
include $(TOPDIR)/Postamble.make
16 changes: 15 additions & 1 deletion programs/extend_files/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@ TOPDIR = ../..

include $(TOPDIR)/Preamble.make

DIST_FILES = extend_files.sh
TESTS = truncate_direct

CLEAN_FILES = $(TESTS)

CFLAGS = -O2 -Wall -g

SOURCES = truncate_direct.c
OBJECTS = $(patsubst %.c,%.o,$(SOURCES))

DIST_FILES = $(SOURCES)

BIN_PROGRAMS = $(TESTS)

truncate_direct: $(OBJECTS)
$(LINK)

include $(TOPDIR)/Postamble.make
3 changes: 2 additions & 1 deletion programs/extendo/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))

DIST_FILES = $(SOURCES)

BIN_PROGRAMS = extendo

extendo: $(OBJECTS)
$(LINK)

include $(TOPDIR)/Test.make
include $(TOPDIR)/Postamble.make
1 change: 0 additions & 1 deletion programs/fill_verify_holes/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,4 @@ fill_holes: fill_holes.o fill_holes.h
verify_holes: verify_holes.o fill_holes.h
$(LINK) $(OCFS2_LIBS)

include $(TOPDIR)/Test.make
include $(TOPDIR)/Postamble.make
3 changes: 2 additions & 1 deletion programs/lock_grab/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))

DIST_FILES = $(SOURCES)

BIN_PROGRAMS = lock_grab

lock_grab: $(OBJECTS)
$(LINK) $(O2DLM_LIBS)

include $(TOPDIR)/Test.make
include $(TOPDIR)/Postamble.make
3 changes: 2 additions & 1 deletion programs/logwriter/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))

DIST_FILES = $(SOURCES)

BIN_PROGRAMS = logwriter

logwriter: $(OBJECTS)
$(LINK)

include $(TOPDIR)/Test.make
include $(TOPDIR)/Postamble.make
3 changes: 2 additions & 1 deletion programs/lvb_torture/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))

DIST_FILES = $(SOURCES)

BIN_PROGRAMS = lvb_torture

lvb_torture: $(OBJECTS)
$(LINK) $(O2DLM_LIBS)

include $(TOPDIR)/Test.make
include $(TOPDIR)/Postamble.make
3 changes: 2 additions & 1 deletion programs/mmap_test/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))

DIST_FILES = $(SOURCES)

BIN_PROGRAMS = mmap_test

mmap_test: $(OBJECTS)
$(LINK)

include $(TOPDIR)/Test.make
include $(TOPDIR)/Postamble.make
3 changes: 2 additions & 1 deletion programs/multi_node_mmap/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))

DIST_FILES = $(SOURCES)

BIN_PROGRAMS = multi_mmap

multi_mmap: $(OBJECTS)
$(LINK)

include $(TOPDIR)/Test.make
include $(TOPDIR)/Postamble.make
3 changes: 2 additions & 1 deletion programs/sendfiletest/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))

DIST_FILES = $(SOURCES)

BIN_PROGRAMS = sendfiletest

sendfiletest: $(OBJECTS)
$(LINK)

include $(TOPDIR)/Test.make
include $(TOPDIR)/Postamble.make
1 change: 0 additions & 1 deletion programs/splice/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,4 @@ splice_read: $(SPLICE_READ_OBJECTS)
splice_write: $(SPLICE_WRITE_OBJECTS)
$(LINK)

include $(TOPDIR)/Test.make
include $(TOPDIR)/Postamble.make
3 changes: 2 additions & 1 deletion programs/truncate/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))

DIST_FILES = $(SOURCES)

BIN_PROGRAMS = truncate

truncate: $(OBJECTS)
$(LINK)

include $(TOPDIR)/Test.make
include $(TOPDIR)/Postamble.make
3 changes: 2 additions & 1 deletion programs/ttest/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))

DIST_FILES = $(SOURCES)

BIN_PROGRAMS = ttest

ttest: $(OBJECTS)
$(LINK)

include $(TOPDIR)/Test.make
include $(TOPDIR)/Postamble.make
3 changes: 2 additions & 1 deletion programs/write_append_truncate/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))

DIST_FILES = $(SOURCES)

BIN_PROGRAMS = write_append_truncate

write_append_truncate: $(OBJECTS)
$(LINK)

include $(TOPDIR)/Test.make
include $(TOPDIR)/Postamble.make
3 changes: 2 additions & 1 deletion programs/write_torture/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))

DIST_FILES = $(SOURCES)

BIN_PROGRAMS = write_torture

write_torture: $(OBJECTS)
$(LINK)

include $(TOPDIR)/Test.make
include $(TOPDIR)/Postamble.make
4 changes: 3 additions & 1 deletion utilities/mpi-run-parts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))

DIST_FILES = $(SOURCES)

BIN_PROGRAMS = mpi-run-parts


mpi-run-parts: $(OBJECTS)
$(LINK)

include $(TOPDIR)/Test.make
include $(TOPDIR)/Postamble.make

0 comments on commit caea2af

Please sign in to comment.