Skip to content
Extraits de code Groupes Projets
Vérifiée Valider e0550f02 rédigé par Kubat's avatar Kubat
Parcourir les fichiers

[build] put config files in their folder

parent b6af9e0c
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!2Rework build process
...@@ -102,5 +102,3 @@ vendor/luajit/src/luajit ...@@ -102,5 +102,3 @@ vendor/luajit/src/luajit
*.tmp *.tmp
cscope.files cscope.files
tags tags
config.guess
config.sub
Fichier déplacé
Fichier déplacé
Fichier déplacé
...@@ -7,12 +7,21 @@ AC_INIT([Aegisub], [aegisub_version],, [aegisub]) ...@@ -7,12 +7,21 @@ AC_INIT([Aegisub], [aegisub_version],, [aegisub])
: ${CFLAGS=""} : ${CFLAGS=""}
: ${CXXFLAGS=""} : ${CXXFLAGS=""}
AC_CONFIG_SRCDIR([src/main.cpp]) AC_CONFIG_SRCDIR([src/main.cpp])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_HEADER([acconf.h]) AC_CONFIG_HEADER([acconf.h])
AC_CONFIG_MACRO_DIR([m4macros]) AC_CONFIG_MACRO_DIR([m4macros])
AC_GNU_SOURCE AC_GNU_SOURCE
AC_CANONICAL_HOST AC_CANONICAL_HOST
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])
##########################
# Only run from source dir
##########################
AEGISUB_PATH_SOURCE="$(dirname $(readlink -f "$0"))"
AEGISUB_PATH_BUILD="$(pwd)"
AS_IF([! test "$AEGISUB_PATH_BUILD" = "$AEGISUB_PATH_BUILD"],
[AC_MSG_ERROR([The build directory must be the same as the source directory])])
################### ###################
# Required packages # Required packages
################### ###################
...@@ -88,6 +97,10 @@ AS_IF([test "x$AEGISUB_APPIMAGE_ENABLED" = "xyes"], [ ...@@ -88,6 +97,10 @@ AS_IF([test "x$AEGISUB_APPIMAGE_ENABLED" = "xyes"], [
AC_PATH_PROG([WGET], [wget]) AC_PATH_PROG([WGET], [wget])
AC_PATH_PROG([CHMOD], [chmod]) AC_PATH_PROG([CHMOD], [chmod])
AS_IF([test "$PATCHELF" = "notfound"], [AC_MSG_ERROR([patchelf is required for AppImage generation])])
AS_IF([test "$WGET" = "notfound"], [AC_MSG_ERROR([wget is required for AppImage generation])])
AS_IF([test "$CHMOD" = "notfound"], [AC_MSG_ERROR([chmod is required for AppImage generation])])
# Download the AppImage creation tool, transforms the AppDir into an AppImage # Download the AppImage creation tool, transforms the AppDir into an AppImage
AC_MSG_CHECKING([Downloading AppImage creation tool]) AC_MSG_CHECKING([Downloading AppImage creation tool])
$WGET https://github.com/probonopd/AppImageKit/releases/download/continuous/appimagetool-`arch`.AppImage -O tools/appimagetool.AppImage -o config.wget.log $WGET https://github.com/probonopd/AppImageKit/releases/download/continuous/appimagetool-`arch`.AppImage -O tools/appimagetool.AppImage -o config.wget.log
......
...@@ -33,6 +33,7 @@ DISTCLEANFILES += \ ...@@ -33,6 +33,7 @@ DISTCLEANFILES += \
$(TOP)build/git_version.h \ $(TOP)build/git_version.h \
$(TOP)Makefile.inc \ $(TOP)Makefile.inc \
$(TOP)config.log \ $(TOP)config.log \
$(TOP)config.wget.log \
$(TOP)acconf.h.in \ $(TOP)acconf.h.in \
$(TOP)config.status \ $(TOP)config.status \
$(TOP)autom4te.cache \ $(TOP)autom4te.cache \
...@@ -41,6 +42,9 @@ DISTCLEANFILES += \ ...@@ -41,6 +42,9 @@ DISTCLEANFILES += \
CLEANFILES += \ CLEANFILES += \
$(wildcard $(TOP)Aegisub/usr/lib/*) \ $(wildcard $(TOP)Aegisub/usr/lib/*) \
$(TOP)Aegisub-x86_64.AppImage \ $(TOP)Aegisub-x86_64.AppImage \
$(TOP)cscope.files \
$(TOP)cscope.out \
$(TOP)tags \
CLEANDIRS += \ CLEANDIRS += \
$(TOP)Aegisub \ $(TOP)Aegisub \
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter