conservatory
/
elk
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix more autotools crap

This commit is contained in:
Lassi Kortela 2023-02-13 15:41:59 +02:00
parent c81aeacfb8
commit e3efc5b46e
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -7,6 +7,7 @@
.auto .auto
.libs .libs
.deps .deps
INSTALL
Makefile Makefile
Makefile.in Makefile.in
aclocal.m4 aclocal.m4
@ -17,6 +18,7 @@ config.log
config.status config.status
configure configure
libtool libtool
m4
stamp-* stamp-*
*-stamp *-stamp
# Configure-generated files # Configure-generated files

3
Makefile.am
View File

@ -12,5 +12,6 @@ EXTRA_DIST = \
MIGRATE \ MIGRATE \
$(NULL) $(NULL)
AUTOMAKE_OPTIONS = dist-bzip2 ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = dist-bzip2

5
configure.ac
View File

@ -5,6 +5,7 @@ AC_CONFIG_SRCDIR([src/main.c])
AC_PREREQ([2.71]) AC_PREREQ([2.71])
AC_CONFIG_AUX_DIR(.auto) AC_CONFIG_AUX_DIR(.auto)
AC_CONFIG_MACRO_DIRS([m4])
AC_CANONICAL_HOST AC_CANONICAL_HOST
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
@ -539,8 +540,8 @@ AM_CONDITIONAL(HAVE_MOTIF, test "${ac_cv_my_have_motif}" = "yes")
AC_SUBST(MOTIF_CFLAGS) AC_SUBST(MOTIF_CFLAGS)
AC_SUBST(MOTIF_LIBS) AC_SUBST(MOTIF_LIBS)
INCLUDES="${INCLUDES} -I\$(top_srcdir)/include -I\$(top_builddir)/include" AM_CPPFLAGS="${INCLUDES} -I\$(top_srcdir)/include -I\$(top_builddir)/include"
AC_SUBST(INCLUDES) AC_SUBST(AM_CPPFLAGS)
dnl Export variables dnl Export variables
AC_SUBST(ELK_CFLAGS) AC_SUBST(ELK_CFLAGS)

3
src/Makefile.am
View File

@ -66,7 +66,7 @@ EXTRA_DIST = \
$(NULL) $(NULL)
bin_PROGRAMS = elk bin_PROGRAMS = elk
elk_LDADD = $(top_builddir)/src/libelk.la elk_LDADD = libelk.la
elk_SOURCES = main.c elk_SOURCES = main.c
install-exec-hook: install-exec-hook:
@ -74,4 +74,3 @@ install-exec-hook:
ln -s elk "$(DESTDIR)$(bindir)/scheme-elk" ln -s elk "$(DESTDIR)$(bindir)/scheme-elk"
echo-sources: ; echo $(SOURCES) echo-sources: ; echo $(SOURCES)