From 820225fbc1feaf1b99f1442e05ff33db681f9a8d Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Thu, 24 Oct 2013 16:56:31 -0700
Subject: [PATCH] Transition automake/autoconf files to modern times
---
configure.ac | 7 +++----
src/api/Makefile.am | 2 +-
src/common/Makefile.am | 6 +++---
src/common/proc_args.c | 2 +-
src/db_api/Makefile.am | 2 +-
5 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
index aa238c65e77..f36181368c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])
diff --git a/src/api/Makefile.am b/src/api/Makefile.am
index c4f1e7bccb0..4da17432660 100644
--- a/src/api/Makefile.am
+++ b/src/api/Makefile.am
@@ -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)
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index a0d6325328c..c899718f2ed 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -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)
diff --git a/src/common/proc_args.c b/src/common/proc_args.c
index b65fa538597..f040cf9d550 100644
--- a/src/common/proc_args.c
+++ b/src/common/proc_args.c
@@ -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 */
diff --git a/src/db_api/Makefile.am b/src/db_api/Makefile.am
index 246a6c6c670..44ebfd03e9d 100644
--- a/src/db_api/Makefile.am
+++ b/src/db_api/Makefile.am
@@ -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:
--
GitLab