Skip to content

Commit

Permalink
Fixing the makefile
Browse files Browse the repository at this point in the history
It seems I have been using automake variables incorrectly
all these years...

Changing the _LDFLAGS to be _LDADD as it is meant to be.

Bumping to version 1.1.
  • Loading branch information
t-brown committed May 7, 2019
1 parent db7ccdd commit 670cf18
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
12 changes: 5 additions & 7 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
#

AC_PREREQ(2.61)
AC_INIT([mcds], [1.0], [tbrown@freeshell.org])
AC_INIT([mcds], [1.1], [tbrown@freeshell.org])
AC_CONFIG_AUX_DIR([build-aux])

# Create the VERSION file, which contains the package version
echo AC_PACKAGE_VERSION>VERSION
# Define our M4 macro directory
AC_CONFIG_MACRO_DIR([m4])

AC_SUBST(PACKAGE_VERSION)

# Internationalization
Expand All @@ -17,9 +18,6 @@ AM_GNU_GETTEXT([external])
# Initialise automake
AM_INIT_AUTOMAKE([foreign -Wall -Werror])

# Define our M4 macro directory
AC_CONFIG_MACRO_DIR([m4])

# Check there is a source file
AC_CONFIG_SRCDIR([src/main.c])
# Put our generated config header in the source directory
Expand All @@ -44,7 +42,7 @@ AC_FUNC_MALLOC
# Shouldn't need this on newer automakes
AM_PROG_CC_C_O

AC_CONFIG_FILES([ Makefile
AC_CONFIG_FILES([Makefile
po/Makefile.in
src/Makefile
])
Expand Down
4 changes: 2 additions & 2 deletions po/mcds.pot
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mcds 1.0\n"
"Project-Id-Version: mcds 1.1\n"
"Report-Msgid-Bugs-To: <tbrown@freeshell.org>\n"
"POT-Creation-Date: 2019-05-06 11:01-0600\n"
"POT-Creation-Date: 2019-05-07 13:52-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down
8 changes: 4 additions & 4 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ mcds_CPPFLAGS = $(CURL_CFLAGS) \
$(XML_CFLAGS) \
$(GPGME_CFLAGS)

mcds_LDFLAGS = $(LTLIBINTL) \
$(CURL_LIBS) \
$(XML_LIBS) \
$(GPGME_LIBS)
mcds_LDADD = $(LTLIBINTL) \
$(CURL_LIBS) \
$(XML_LIBS) \
$(GPGME_LIBS)

mcds_SOURCES = defs.h \
options.h \
Expand Down

0 comments on commit 670cf18

Please sign in to comment.