Clean up autotools build scripts

- Removed unused platform/unix/gen-makefile
- Added current version as suffix to the built library (now liblove-0.11.0.so, for example)
  - Added target version to configure.ac
- Include .lua files as sources, so they get included in 'make dist'

--HG--
branch : minor
This commit is contained in:
Bart van Strien
2017-01-15 22:07:51 +01:00
parent 44dc4bb2a2
commit ff336041a9
3 changed files with 3 additions and 41 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
AC_INIT([love], [HEAD])
AC_INIT([love], [0.11.0])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR([platform/unix])
AC_CONFIG_MACRO_DIR([platform/unix/m4])
-38
View File
@@ -1,38 +0,0 @@
#!/bin/bash
echo Generating src/Makefile.am ...
inc_current='$(srcdir)'
inc_modules="$inc_current/modules"
inc_libraries="$inc_current/libraries"
cat > src/Makefile.am << EOF
AM_CPPFLAGS = -I$inc_current -I$inc_modules -I$inc_libraries -I$inc_libraries/enet/libenet/include \$(LOVE_INCLUDES) \$(FILE_OFFSET)
AM_CXXFLAGS = \$(SDL_CFLAGS)
AUTOMAKE_OPTIONS = subdir-objects
SUBDIRS =
if LOVE_BUILD_EXE
# LÖVE executable
bin_PROGRAMS = love
#love_LDFLAGS =
love_LDADD = liblove.la
love_SOURCES = love.cpp
endif
# Compile scripts
#scripts/%.lua.h: scripts/%.lua
# cd scripts; \
# lua auto.lua \$*
#TODO: Figure out how to only do this on gnu make, and detect which lua
# executable to run
# libLÖVE
lib_LTLIBRARIES = liblove.la
liblove_la_LDFLAGS = -module -export-dynamic \$(LDFLAGS) \$(SDL_LIBS)
EOF
platform/unix/genmodules >> src/Makefile.am
printf "\n" >> src/Makefile.am
cd ..
echo "src/Makefile.am is updated! ^.^"
+2 -2
View File
@@ -16,7 +16,7 @@ implfind()
sourcefind()
{
find "$1" $2 -type f \( -iname "*.c" -o -iname "*.cpp" -o -iname "*.h" -o -iname "*.hpp" -o -iname "*.lch" \) | awk "{print \"./$prefix\"\$0\" \\\\\"}" | grep -v -f"$LOVEROOT/platform/unix/exclude"
find "$1" $2 -type f \( -iname "*.c" -o -iname "*.cpp" -o -iname "*.h" -o -iname "*.hpp" -o -iname "*.lch" -o -iname "*.lua" \) | awk "{print \"./$prefix\"\$0\" \\\\\"}" | grep -v -f"$LOVEROOT/platform/unix/exclude"
}
handlemodule()
@@ -142,7 +142,7 @@ endif
# libLÖVE
lib_LTLIBRARIES = liblove${love_suffix}.la
liblove${love_amsuffix}_la_LDFLAGS = -module -export-dynamic \$(LDFLAGS)
liblove${love_amsuffix}_la_LDFLAGS = -module -export-dynamic \$(LDFLAGS) -release \$(PACKAGE_VERSION)
liblove${love_amsuffix}_la_LIBADD = \
\$(SDL_LIBS) \$(freetype2_LIBS) \$(lua_LIBS)\
\$(openal_LIBS) \$(zlib_LIBS) \$(libmodplug_LIBS)\