Skip to content
Snippets Groups Projects
Commit 820225fb authored by Danny Auble's avatar Danny Auble
Browse files

Transition automake/autoconf files to modern times

parent 22cfb490
No related branches found
No related tags found
No related merge requests found
......@@ -3,7 +3,8 @@
dnl Prologue
dnl
AC_INIT
AC_INIT(slurm, m4_esyscmd_s([perl -ne 'print,exit if s/^\s*VERSION:\s*(\S*).*/\1/i' ./META]), [slurm-dev@schedmd.com], [], [http://slurm.schedmd.com])
AC_PREREQ(2.59)
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_AUX_DIR([auxdir])
......@@ -14,15 +15,13 @@ AM_CONDITIONAL(DONT_BUILD, test "1" = "0")
X_AC_GPL_LICENSED
#
# Determine project/version from META file.
# Sets PACKAGE, VERSION, SLURM_VERSION
X_AC_SLURM_VERSION
dnl Initialize Automake
dnl
AM_INIT_AUTOMAKE(slurm, $VERSION)
AM_INIT_AUTOMAKE(no-define)
AM_MAINTAINER_MODE
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_HEADERS([slurm/slurm.h])
......
......@@ -152,7 +152,7 @@ libslurm_o_LDADD = $(top_builddir)/src/common/libeio.o \
$(top_builddir)/src/common/libspank.o \
$(top_builddir)/src/common/libcommon.o
libslurm.o: $(libslurmhelper_la_OBJECTS) $(libslurm_o_LDADD)
libslurm.o$(EXEEXT): $(libslurmhelper_la_OBJECTS) $(libslurm_o_LDADD)
$(LINK) $(libslurmhelper_la_OBJECTS) $(libslurm_o_LDADD)
......
......@@ -150,19 +150,19 @@ libcommon_la_LDFLAGS = $(HWLOC_LDFLAGS) $(LIB_LDFLAGS) -module --export-dynamic
# This was made so we could export all symbols from libcommon
# on multiple platforms
libcommon_o_SOURCES =
libcommon.o : $(libcommon_la_OBJECTS) $(libcommon_la_DEPENDENCIES)
libcommon.o$(EXEEXT) : $(libcommon_la_OBJECTS) $(libcommon_la_DEPENDENCIES)
$(LINK) $(libcommon_la_OBJECTS)
# This was made so we could export all symbols from libeio
# on multiple platforms
libeio_o_SOURCES =
libeio.o : $(libeio_la_OBJECTS) $(libeio_la_DEPENDENCIES)
libeio.o$(EXEEXT) : $(libeio_la_OBJECTS) $(libeio_la_DEPENDENCIES)
$(LINK) $(libeio_la_OBJECTS)
# This was made so we could export all symbols from libspank
# on multiple platforms
libspank_o_SOURCES =
libspank.o : $(libspank_la_OBJECTS) $(libspank_la_DEPENDENCIES)
libspank.o$(EXEEXT) : $(libspank_la_OBJECTS) $(libspank_la_DEPENDENCIES)
$(LINK) $(libspank_la_OBJECTS)
......
......@@ -85,7 +85,7 @@
/* print this version of SLURM */
void print_slurm_version(void)
{
printf("%s %s\n", PACKAGE, SLURM_VERSION_STRING);
printf("%s\n", PACKAGE_STRING);
}
/* print the available gres options */
......
......@@ -83,7 +83,7 @@ libslurmdb_o_SOURCES =
libslurmdb_o_LDADD = $(top_builddir)/src/api/libslurm.o
libslurmdb.o: $(libslurmdb_la_OBJECTS) $(libslurmdb_o_LDADD)
libslurmdb.o$(EXEEXT): $(libslurmdb_la_OBJECTS) $(libslurmdb_o_LDADD)
$(LINK) $(libslurmdb_la_OBJECTS) $(libslurmdb_o_LDADD)
force:
......
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