Skip to content
Snippets Groups Projects
Commit f13d3ea1 authored by Mark Grondona's avatar Mark Grondona
Browse files

o nodelist.[ch] needed to move from here to src/common

parent dbb85c33
No related branches found
No related tags found
No related merge requests found
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
EXTRA_DIST = slurm.h
INCLUDES = -I$(top_srcdir)/src/common INCLUDES = -I$(top_srcdir)/src/common
# should we build individual modules? # should we build individual modules?
...@@ -18,10 +20,9 @@ endif ...@@ -18,10 +20,9 @@ endif
# link to libslurm (for test modules): # link to libslurm (for test modules):
LDADD = -lslurm LDADD = -lslurm
lib_LTLIBRARIES = libslurm.la lib_LTLIBRARIES = libslurm.la
libslurm_la_SOURCES = \ libslurm_la_SOURCES = \
nodelist.c \
allocate.c \ allocate.c \
build_info.c \ build_info.c \
job_info.c \ job_info.c \
...@@ -49,11 +50,13 @@ libslurm.sym : ...@@ -49,11 +50,13 @@ libslurm.sym :
cp slurmapi.exp libslurm.sym cp slurmapi.exp libslurm.sym
# hack to allow building .lo objects from other directories # hack to allow building .lo objects from other directories
$(filter %.lo, $(libslurm_la_LIBADD)) : %.lo : %.c ../*/*.lo : %.lo : %.c
cd `echo $@|sed 's#/[^/]*\$$##'` && $(MAKE) `echo $@|sed 's#.*/##'` cd `echo $@|sed 's#/[^/]*\$$##'` && $(MAKE) `echo $@|sed 's#.*/##'`
#$(filter %.lo, $(libslurm_la_LIBADD)) : %.lo : %.c
# cd `echo $@|sed 's#/[^/]*\$$##'` && $(MAKE) `echo $@|sed 's#.*/##'`
$(filter %.la, $(libslurm_la_LIBADD)) : %.la : #$(filter %.la, $(libslurm_la_LIBADD)) : %.la :
cd `echo $@|sed 's#/[^/]*\$$##'` && $(MAKE) `echo $@|sed 's#.*/##'` # cd `echo $@|sed 's#/[^/]*\$$##'` && $(MAKE) `echo $@|sed 's#.*/##'`
# target specific CFLAGS do not work until automake 1.5, use explicit rules # target specific CFLAGS do not work until automake 1.5, use explicit rules
# for now. If we ever move to 1.5, the CFLAGS defs below should work in # for now. If we ever move to 1.5, the CFLAGS defs below should work in
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment