beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1714 from andrewshadura/master

Browse source 
Fix autoconf and automake files
This commit is contained in:
Hylke Bons 2016-08-16 18:25:45 +01:00 committed by GitHub
parent 1a8204254a dff13408f8
commit 16038b3896
6 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -1,3 +1,5 @@
ACLOCAL_AMFLAGS = -I build/m4/sparkleshare -I build/m4/shamrock -I build/m4/shave
basedirs = build Sparkles Sparkles/Git basedirs = build Sparkles Sparkles/Git
SUBDIRS = $(basedirs) $(GUISUBDIRS) SUBDIRS = $(basedirs) $(GUISUBDIRS)

3
SparkleShare/Linux/Images/icons/hicolor/Makefile.am
View file

@ -1,9 +1,10 @@
theme = hicolor theme = hicolor
system_themedir = $(datadir)/icons/$(theme)
app_themedir = $(pkgdatadir)/icons/$(theme) app_themedir = $(pkgdatadir)/icons/$(theme)
if BUILD_XDG_APP if BUILD_XDG_APP
system_themedir = $(app_themedir) system_themedir = $(app_themedir)
else
system_themedir = $(datadir)/icons/$(theme)
endif endif
system_theme_icons = \ system_theme_icons = \

2
build/build.environment.mk
View file

@ -18,7 +18,7 @@ REF_SPARKLES = $(LINK_SYSTEM) $(LINK_MONO_POSIX)
LINK_SPARKLES = -r:$(DIR_BIN)/Sparkles.dll -r:$(DIR_BIN)/Sparkles.Git.dll LINK_SPARKLES = -r:$(DIR_BIN)/Sparkles.dll -r:$(DIR_BIN)/Sparkles.Git.dll
LINK_SPARKLES_DEPS = $(REF_SPARKLES) $(LINK_SPARKLES) LINK_SPARKLES_DEPS = $(REF_SPARKLES) $(LINK_SPARKLES)
REF_SPARKLESHARE = $(LINK_GTK) $(LINK_SPARKLES_DEPS) $(LINK_APP_INDICATOR) $(LINK_WEBKIT) REF_SPARKLESHARE = $(LINK_TESTS) $(LINK_GTK) $(LINK_SPARKLES_DEPS) $(LINK_APP_INDICATOR) $(LINK_WEBKIT)
# Cute hack to replace a space with something # Cute hack to replace a space with something
colon:= : colon:= :

2
build/build.rules.mk
View file

@ -19,7 +19,7 @@ ASSEMBLY_FILE = $(top_builddir)/bin/$(ASSEMBLY).$(ASSEMBLY_EXTENSION)
INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_DIR))) INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_DIR)))
if ENABLE_TESTS if ENABLE_TESTS
LINK = " $(NUNIT_LIBS)" LINK_TESTS = "$(NUNIT_LIBS)"
ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS" ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
endif endif

6
build/m4/shamrock/mono.m4
View file

@ -13,6 +13,11 @@ AC_DEFUN([SHAMROCK_FIND_MONO_4_0_COMPILER],
SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, dmcs) SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, dmcs)
]) ])
AC_DEFUN([SHAMROCK_FIND_MONO_4_5_COMPILER],
[
SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, mcs)
])
AC_DEFUN([SHAMROCK_FIND_MONO_RUNTIME], AC_DEFUN([SHAMROCK_FIND_MONO_RUNTIME],
[ [
SHAMROCK_FIND_PROGRAM_OR_BAIL(MONO, mono) SHAMROCK_FIND_PROGRAM_OR_BAIL(MONO, mono)
@ -65,4 +70,3 @@ AC_DEFUN([SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES],
fi fi
done done
]) ])

25
configure.ac
View file

@ -5,6 +5,9 @@ AC_PREREQ([2.54])
AC_INIT([SparkleShare], sparkleshare_version) AC_INIT([SparkleShare], sparkleshare_version)
AM_INIT_AUTOMAKE([1.11 dist-bzip2 dist-zip foreign tar-pax]) AM_INIT_AUTOMAKE([1.11 dist-bzip2 dist-zip foreign tar-pax])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
LT_INIT
AC_CONFIG_MACRO_DIRS([build/m4/sparkleshare build/m4/shamrock build/m4/shave])
dnl Export Version Info dnl Export Version Info
AC_SUBST([ASM_VERSION], [sparkleshare_version]) AC_SUBST([ASM_VERSION], [sparkleshare_version])
@ -15,20 +18,18 @@ if test "x$PKG_CONFIG" = "xno"; then
AC_MSG_ERROR([pkg-config is not installed]) AC_MSG_ERROR([pkg-config is not installed])
fi fi
AC_SUBST([ACLOCAL_AMFLAGS], ["-I build/m4/sparkleshare -I build/m4/shamrock -I build/m4/shave \${ACLOCAL_FLAGS}"])
SHAMROCK_EXPAND_LIBDIR SHAMROCK_EXPAND_LIBDIR
SHAMROCK_EXPAND_BINDIR SHAMROCK_EXPAND_BINDIR
SHAMROCK_EXPAND_DATADIR SHAMROCK_EXPAND_DATADIR
AC_PROG_INSTALL AC_PROG_INSTALL
dnl Mono and gmcs dnl Mono and mcs
SHAMROCK_CHECK_MONO_MODULE(2.8) SHAMROCK_CHECK_MONO_MODULE(3.2.8)
SHAMROCK_FIND_MONO_RUNTIME SHAMROCK_FIND_MONO_RUNTIME
PKG_CHECK_EXISTS([mono >= 2.8], PKG_CHECK_EXISTS([mono >= 3.2.8],
[SHAMROCK_FIND_MONO_4_0_COMPILER [SHAMROCK_FIND_MONO_4_5_COMPILER
SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES([ SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES([
System System
])] ])]
@ -114,13 +115,13 @@ SparkleShare/Makefile
SparkleShare/Common/Makefile SparkleShare/Common/Makefile
SparkleShare/Common/HTML/Makefile SparkleShare/Common/HTML/Makefile
SparkleShare/Common/Presets/Makefile SparkleShare/Common/Presets/Makefile
SparkleShare/Common/Pixmaps/Makefile SparkleShare/Common/Images/Makefile
SparkleShare/Linux/Makefile SparkleShare/Linux/Makefile
SparkleShare/Linux/Pixmaps/Makefile SparkleShare/Linux/Images/Makefile
SparkleShare/Linux/Pixmaps/icons/Makefile SparkleShare/Linux/Images/icons/Makefile
SparkleShare/Linux/Pixmaps/icons/hicolor/Makefile SparkleShare/Linux/Images/icons/hicolor/Makefile
SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/Makefile SparkleShare/Linux/Images/icons/ubuntu-mono-dark/Makefile
SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/Makefile SparkleShare/Linux/Images/icons/ubuntu-mono-light/Makefile
SparkleShare/Linux/sparkleshare SparkleShare/Linux/sparkleshare
]) ])