Commit f94fc9a2 authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Move libsetup.pm down to common directory where it belongs. Note, I did

this by moving (well, copying) the rcs file in the CVS tree so that we do
not lose the history.
parent 13e6b16a
...@@ -49,6 +49,10 @@ tmcc: tmcc.c decls.h $(SSLOBJ) ...@@ -49,6 +49,10 @@ tmcc: tmcc.c decls.h $(SSLOBJ)
$(CC) $(CFLAGS) $(SSLFLAGS) -static -g -o tmcc $< $(SSLOBJ) \ $(CC) $(CFLAGS) $(SSLFLAGS) -static -g -o tmcc $< $(SSLOBJ) \
$(LFLAGS) $(TMLIBS) $(LFLAGS) $(TMLIBS)
tmcc-shared: tmcc.c decls.h $(SSLOBJ)
$(CC) $(CFLAGS) $(SSLFLAGS) -g -o tmcc $< $(SSLOBJ) \
$(LFLAGS) $(TMLIBS)
tmcc-nossl: tmcc.c decls.h tmcc-nossl: tmcc.c decls.h
$(CC) $(CFLAGS) -static -g -o tmcc-nossl $< $(LFLAGS) $(CC) $(CFLAGS) -static -g -o tmcc-nossl $< $(LFLAGS)
......
...@@ -64,7 +64,7 @@ path-install: dir-install ...@@ -64,7 +64,7 @@ path-install: dir-install
$(INSTALL) -m 755 $(SRCDIR)/paths.sh $(ETCDIR)/paths.sh $(INSTALL) -m 755 $(SRCDIR)/paths.sh $(ETCDIR)/paths.sh
common-script-install: dir-install common-script-install: dir-install
$(INSTALL) -m 755 $(SRCDIR)/../libsetup.pm $(BINDIR)/libsetup.pm $(INSTALL) -m 755 $(SRCDIR)/libsetup.pm $(BINDIR)/libsetup.pm
$(INSTALL) -m 755 $(SRCDIR)/libtmcc.pm $(BINDIR)/libtmcc.pm $(INSTALL) -m 755 $(SRCDIR)/libtmcc.pm $(BINDIR)/libtmcc.pm
$(INSTALL) -m 755 $(SRCDIR)/libtestbed.pm $(BINDIR)/libtestbed.pm $(INSTALL) -m 755 $(SRCDIR)/libtestbed.pm $(BINDIR)/libtestbed.pm
$(INSTALL) -m 755 $(SRCDIR)/tmcc.pl $(BINDIR)/tmcc $(INSTALL) -m 755 $(SRCDIR)/tmcc.pl $(BINDIR)/tmcc
...@@ -105,6 +105,6 @@ remote-script-install: common-script-install ...@@ -105,6 +105,6 @@ remote-script-install: common-script-install
-chmod u+s $(BINDIR)/vnodesetup -chmod u+s $(BINDIR)/vnodesetup
control-script-install: dir-install control-script-install: dir-install
$(INSTALL) -m 755 $(SRCDIR)/../libsetup.pm $(BINDIR)/libsetup.pm $(INSTALL) -m 755 $(SRCDIR)/libsetup.pm $(BINDIR)/libsetup.pm
$(INSTALL) -m 755 $(SRCDIR)/watchdog $(BINDIR)/watchdog $(INSTALL) -m 755 $(SRCDIR)/watchdog $(BINDIR)/watchdog
$(INSTALL) -m 755 $(SRCDIR)/update $(BINDIR)/update $(INSTALL) -m 755 $(SRCDIR)/update $(BINDIR)/update
This diff is collapsed.
...@@ -11,15 +11,14 @@ SUBDIR = tmcd/plab ...@@ -11,15 +11,14 @@ SUBDIR = tmcd/plab
# #
COMSCRIPTS = $(addprefix $(TESTBED_SRCDIR)/tmcd/common/, \ COMSCRIPTS = $(addprefix $(TESTBED_SRCDIR)/tmcd/common/, \
paths.sh paths.pm runstartup vnodesetup update watchdog \ paths.sh paths.pm runstartup vnodesetup update watchdog \
libtmcc.pm) libtmcc.pm libsetup.pm)
LINSCRIPTS = $(TESTBED_SRCDIR)/tmcd/linux/liblocsetup.pm LINSCRIPTS = $(TESTBED_SRCDIR)/tmcd/linux/liblocsetup.pm
TMCDSCRIPTS = $(TESTBED_SRCDIR)/tmcd/libsetup.pm
PLABSCRIPTS = $(addprefix $(TESTBED_SRCDIR)/tmcd/plab/, \ PLABSCRIPTS = $(addprefix $(TESTBED_SRCDIR)/tmcd/plab/, \
plabsetup rc.inplab rusaged) plabsetup rc.inplab rusaged)
OSSCRIPTS = $(addprefix $(TESTBED_SRCDIR)/os/, \ OSSCRIPTS = $(addprefix $(TESTBED_SRCDIR)/os/, \
install-tarfile install-rpm) install-tarfile install-rpm)
EESCRIPTS = $(TESTBED_SRCDIR)/tmcd/plab/rc.vinit EESCRIPTS = $(TESTBED_SRCDIR)/tmcd/plab/rc.vinit
ULEESCRIPTS = $(COMSCRIPTS) $(LINSCRIPTS) $(TMCDSCRIPTS) $(PLABSCRIPTS) ULEESCRIPTS = $(COMSCRIPTS) $(LINSCRIPTS) $(PLABSCRIPTS)
ALLSCRIPTS = $(ULEESCRIPTS) $(OSSCRIPTS) $(EESCRIPTS) ALLSCRIPTS = $(ULEESCRIPTS) $(OSSCRIPTS) $(EESCRIPTS)
# #
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment