ObjFW/ObjXMPP
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update buildsys.

Browse source
This commit is contained in:
Jonathan Schleifer 2012-11-08 12:56:35 +01:00
parent 1602ca3148
commit 3c8dcd510d
3 changed files with 275 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

325
buildsys.mk.in
View file

@ -1,8 +1,8 @@
# #
# Copyright (c) 2007, 2008, 2009, 2010, 2011 # Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012
# Jonathan Schleifer <js@webkeks.org> # Jonathan Schleifer <js@webkeks.org>
# #
# https://webkeks.org/hg/buildsys/ # https://webkeks.org/git/?p=buildsys.git
# #
# Permission to use, copy, modify, and/or distribute this software for any # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above # purpose with or without fee is hereby granted, provided that the above
@ -21,7 +21,8 @@
# POSSIBILITY OF SUCH DAMAGE. # POSSIBILITY OF SUCH DAMAGE.
# #
PACKAGE = @PACKAGE@ PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
AS = @AS@ AS = @AS@
CC = @CC@ CC = @CC@
CXX = @CXX@ CXX = @CXX@
@ -59,22 +60,30 @@ PLUGIN_SUFFIX = @PLUGIN_SUFFIX@
INSTALL_LIB = @INSTALL_LIB@ INSTALL_LIB = @INSTALL_LIB@
UNINSTALL_LIB = @UNINSTALL_LIB@ UNINSTALL_LIB = @UNINSTALL_LIB@
CLEAN_LIB = @CLEAN_LIB@ CLEAN_LIB = @CLEAN_LIB@
CC_DEPENDS = @CC_DEPENDS@
CXX_DEPENDS = @CXX_DEPENDS@
OBJC_DEPENDS = @OBJC_DEPENDS@
OBJCXX_DEPENDS = @OBJCXX_DEPENDS@
LN_S = @LN_S@ LN_S = @LN_S@
MKDIR_P = mkdir -p MKDIR_P = mkdir -p
INSTALL = @INSTALL@ INSTALL = @INSTALL@
SHELL = @SHELL@ SHELL = @SHELL@
MSGFMT = @MSGFMT@ MSGFMT = @MSGFMT@
JAVAC = @JAVAC@
JAVACFLAGS = @JAVACFLAGS@
JAR = @JAR@
WINDRES = @WINDRES@
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
bindir = @bindir@ bindir = @bindir@
libdir = @libdir@ libdir = @libdir@
plugindir ?= ${libdir}/${PACKAGE} plugindir ?= ${libdir}/${PACKAGE_NAME}
datarootdir = @datarootdir@ datarootdir = @datarootdir@
datadir = @datadir@ datadir = @datadir@
includedir = @includedir@ includedir = @includedir@
includesubdir ?= ${PACKAGE} includesubdir ?= ${PACKAGE_NAME}
localedir = @localedir@ localedir = @localedir@
localename ?= ${PACKAGE} localename ?= ${PACKAGE_NAME}
mandir = @mandir@ mandir = @mandir@
mansubdir ?= man1 mansubdir ?= man1
@ -83,11 +92,13 @@ OBJS2 = ${OBJS1:.cc=.o}
OBJS3 = ${OBJS2:.cxx=.o} OBJS3 = ${OBJS2:.cxx=.o}
OBJS4 = ${OBJS3:.d=.o} OBJS4 = ${OBJS3:.d=.o}
OBJS5 = ${OBJS4:.erl=.beam} OBJS5 = ${OBJS4:.erl=.beam}
OBJS6 = ${OBJS5:.m=.o} OBJS6 = ${OBJS5:.java=.class}
OBJS7 = ${OBJS6:.mm=.o} OBJS7 = ${OBJS6:.m=.o}
OBJS8 = ${OBJS7:.py=.pyc} OBJS8 = ${OBJS7:.mm=.o}
OBJS9 = ${OBJS8:.xpm=.o} OBJS9 = ${OBJS8:.py=.pyc}
OBJS += ${OBJS9:.S=.o} OBJS10 = ${OBJS9:.rc=.o}
OBJS11 = ${OBJS10:.S=.o}
OBJS += ${OBJS11:.xpm=.o}
LIB_OBJS = ${OBJS:.o=.lib.o} LIB_OBJS = ${OBJS:.o=.lib.o}
PLUGIN_OBJS = ${OBJS:.o=.plugin.o} PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
@ -96,18 +107,20 @@ MO_FILES = ${LOCALES:.po=.mo}
.SILENT: .SILENT:
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .beam .c .c.dep .cc .cc.dep .cxx .cxx.dep .d .erl .lib.o .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .xpm .S .S.dep .SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o .java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
.PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales .PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS}
all: all:
${MAKE} ${MFLAGS} subdirs ${MAKE} ${MFLAGS} subdirs
${MAKE} ${MFLAGS} depend ${MAKE} ${MFLAGS} depend
${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${LIB} ${LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} locales ${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales
subdirs: subdirs: ${SUBDIRS}
for i in ${SUBDIRS}; do \
${SUBDIRS}:
for i in $@; do \
${DIR_ENTER}; \ ${DIR_ENTER}; \
${MAKE} ${MFLAGS} || exit 1; \ ${MAKE} ${MFLAGS} || exit $$?; \
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
@ -117,13 +130,39 @@ depend: pre-depend ${SRCS}
test -f .deps || regen=1; \ test -f .deps || regen=1; \
for i in ${SRCS}; do \ for i in ${SRCS}; do \
case $$i in \ case $$i in \
*.c | *.cc | *.cxx | *.m | *.mm | *.S) \ *.c) \
if test x"${CC_DEPENDS}" = x"yes"; then \
test $$i -nt .deps && regen=1; \ test $$i -nt .deps && regen=1; \
deps="$$deps $$i.dep"; \ deps="$$deps $$i.dep"; \
fi; \
;; \
*.cc | *.cxx) \
if test x"${CXX_DEPENDS}" = x"yes"; then \
test $$i -nt .deps && regen=1; \
deps="$$deps $$i.dep"; \
fi; \
;; \
*.m) \
if test x"${OBJC_DEPENDS}" = x"yes"; then \
test $$i -nt .deps && regen=1; \
deps="$$deps $$i.dep"; \
fi; \
;; \
*.mm) \
if test x"${OBJCXX_DEPENDS}" = x"yes"; then \
test $$i -nt .deps && regen=1; \
deps="$$deps $$i.dep"; \
fi; \
;; \
*.S) \
if test x"${AS_DEPENDS}" = x"yes"; then \
test $$i -nt .deps && regen=1; \
deps="$$deps $$i.dep"; \
fi; \
;; \ ;; \
esac; \ esac; \
done; \ done; \
if test x"$$regen" = x"1" -a x"$$deps" != "x"; then \ if test x"$$regen" = x"1" -a x"$$deps" != x""; then \
${DEPEND_STATUS}; \ ${DEPEND_STATUS}; \
if ${MAKE} ${MFLAGS} $$deps && cat $$deps >.deps; then \ if ${MAKE} ${MFLAGS} $$deps && cat $$deps >.deps; then \
rm -f $$deps; \ rm -f $$deps; \
@ -135,43 +174,62 @@ depend: pre-depend ${SRCS}
fi; \ fi; \
fi fi
.c.c.dep .cc.cc.dep .cxx.cxx.dep .m.m.dep .mm.mm.dep .S.S.dep: .c.c.dep:
${CPP} ${CPPFLAGS} -M $< | \ ${CPP} ${CPPFLAGS} ${CFLAGS} -M $< | \
sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \
{ rm -f $@; false; }
.cc.cc.dep .cxx.cxx.dep:
${CPP} ${CPPFLAGS} ${CXXFLAGS} -M $< | \
sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \
{ rm -f $@; false; }
.m.m.dep:
${CPP} ${CPPFLAGS} ${OBJCFLAGS} -M $< | \
sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \
{ rm -f $@; false; }
.mm.mm.dep:
${CPP} ${CPPFLAGS} ${OBJCPPFLAGS} -M $< | \
sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \
{ rm -f $@; false; }
.S.S.dep:
${CPP} ${CPPFLAGS} ${ASFLAGS} -M $< | \
sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \ sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \
{ rm -f $@; false; } { rm -f $@; false; }
pre-depend: pre-depend:
${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
${LINK_STATUS} ${LINK_STATUS}
if ${LD} -o $@ ${OBJS} ${LDFLAGS} ${LIBS}; then \ if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \
${LINK_OK}; \ ${LINK_OK}; \
else \ else \
${LINK_FAILED}; \ ${LINK_FAILED}; \
fi fi
${LIB} ${LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${JARFILE}: ${EXT_DEPS} ${JAR_MANIFEST} ${OBJS} ${OBJS_EXTRA}
${LINK_STATUS}; \ ${LINK_STATUS}
if ${LD} -o $@ ${LIB_OBJS} ${LIB_LDFLAGS} ${LDFLAGS} ${LIBS}; then \ if test x"${JAR_MANIFEST}" != x""; then \
if ${JAR} cfm ${JARFILE} ${JAR_MANIFEST} ${OBJS} ${OBJS_EXTRA}; then \
${LINK_OK}; \ ${LINK_OK}; \
else \ else \
${LINK_FAILED}; \ ${LINK_FAILED}; \
fi \ fi \
else \
${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS} if ${JAR} cf ${JARFILE} ${OBJS} ${OBJS_EXTRA}; then \
${LINK_STATUS}
if ${LD} -o $@ ${PLUGIN_OBJS} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}; then \
${LINK_OK}; \ ${LINK_OK}; \
else \ else \
${LINK_FAILED}; \ ${LINK_FAILED}; \
fi \
fi fi
${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
${LINK_STATUS} ${LINK_STATUS}; \
rm -f $@
objs=""; \ objs=""; \
ars=""; \ ars=""; \
for i in ${OBJS}; do \ for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \
case $$i in \ case $$i in \
*.a) \ *.a) \
ars="$$ars $$i" \ ars="$$ars $$i" \
@ -186,7 +244,78 @@ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS}
rm -fr $$dir; \ rm -fr $$dir; \
mkdir -p $$dir; \ mkdir -p $$dir; \
cd $$dir; \ cd $$dir; \
ar x ../$$i; \ ${AR} x ../$$i; \
for j in *.o; do \
objs="$$objs $$dir/$$j"; \
done; \
cd ..; \
done; \
if ${LD} -o $@ $$objs ${LIB_LDFLAGS} ${LDFLAGS} ${LIBS}; then \
${LINK_OK}; \
else \
${LINK_FAILED}; \
fi; \
for i in $$ars; do \
dir=".$$(echo $$i | sed 's/\//_/g').objs"; \
rm -fr $$dir; \
done
${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
${LINK_STATUS}
objs=""; \
ars=""; \
for i in ${PLUGIN_OBJS}; do \
case $$i in \
*.a) \
ars="$$ars $$i" \
;; \
*.o) \
objs="$$objs $$i" \
;; \
esac \
done; \
for i in $$ars; do \
dir=".$$(echo $$i | sed 's/\//_/g').objs"; \
rm -fr $$dir; \
mkdir -p $$dir; \
cd $$dir; \
${AR} x ../$$i; \
for j in *.o; do \
objs="$$objs $$dir/$$j"; \
done; \
cd ..; \
done; \
if ${LD} -o $@ $$objs ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}; then \
${LINK_OK}; \
else \
${LINK_FAILED}; \
fi; \
for i in $$ars; do \
dir=".$$(echo $$i | sed 's/\//_/g').objs"; \
rm -fr $$dir; \
done
${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
${LINK_STATUS}
rm -f $@
objs=""; \
ars=""; \
for i in ${OBJS} ${OBJS_EXTRA}; do \
case $$i in \
*.a) \
ars="$$ars $$i" \
;; \
*.o) \
objs="$$objs $$i" \
;; \
esac \
done; \
for i in $$ars; do \
dir=".$$(echo $$i | sed 's/\//_/g').objs"; \
rm -fr $$dir; \
mkdir -p $$dir; \
cd $$dir; \
${AR} x ../$$i; \
for j in *.o; do \ for j in *.o; do \
objs="$$objs $$dir/$$j"; \ objs="$$objs $$dir/$$j"; \
done; \ done; \
@ -203,14 +332,42 @@ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS}
rm -fr $$dir; \ rm -fr $$dir; \
done done
${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
${LINK_STATUS} ${LINK_STATUS}
if ${AR} cr $@ ${LIB_OBJS} && ${RANLIB} $@; then \ rm -f $@
objs=""; \
ars=""; \
for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \
case $$i in \
*.a) \
ars="$$ars $$i" \
;; \
*.o) \
objs="$$objs $$i" \
;; \
esac \
done; \
for i in $$ars; do \
dir=".$$(echo $$i | sed 's/\//_/g').objs"; \
rm -fr $$dir; \
mkdir -p $$dir; \
cd $$dir; \
${AR} x ../$$i; \
for j in *.o; do \
objs="$$objs $$dir/$$j"; \
done; \
cd ..; \
done; \
if ${AR} cr $@ $$objs && ${RANLIB} $@; then \
${LINK_OK}; \ ${LINK_OK}; \
else \ else \
${LINK_FAILED}; \ ${LINK_FAILED}; \
rm -f $@; \ rm -f $@; \
fi fi; \
for i in $$ars; do \
dir=".$$(echo $$i | sed 's/\//_/g').objs"; \
rm -fr $$dir; \
done
locales: ${MO_FILES} locales: ${MO_FILES}
@ -282,6 +439,14 @@ locales: ${MO_FILES}
${COMPILE_FAILED}; \ ${COMPILE_FAILED}; \
fi fi
.java.class:
${COMPILE_STATUS}
if ${JAVAC} ${JAVACFLAGS} $<; then \
${COMPILE_OK}; \
else \
${COMPILE_FAILED}; \
fi
.m.o: .m.o:
${COMPILE_STATUS} ${COMPILE_STATUS}
if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
@ -342,27 +507,13 @@ locales: ${MO_FILES}
${COMPILE_FAILED}; \ ${COMPILE_FAILED}; \
fi fi
.xpm.o: .rc.o .rc.lib.o .rc.plugin.o:
${COMPILE_STATUS} ${COMPILE_STATUS}
if ${CC} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \ if ${WINDRES} ${CPPFLAGS} -J rc -O coff -o $@ $<; then \
${COMPILE_OK}; \ ${COMPILE_OK}; \
else \ else \
${COMPILE_FAILED}; \ ${COMPILE_FAILED}; \
fi fi
.xpm.lib.o:
${COMPILE_LIB_STATUS}
if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
${COMPILE_LIB_OK}; \
else \
${COMPILE_LIB_FAILED}; \
fi
.xpm.plugin.o:
${COMPILE_PLUGIN_STATUS}
if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
${COMPILE_PLUGIN_OK}; \
else \
${COMPILE_PLUGIN_FAILED}; \
fi
.S.o: .S.o:
${COMPILE_STATUS} ${COMPILE_STATUS}
@ -386,14 +537,36 @@ locales: ${MO_FILES}
${COMPILE_PLUGIN_FAILED}; \ ${COMPILE_PLUGIN_FAILED}; \
fi fi
install: ${LIB} ${STATIC_LIB} ${STATIC_PIC_LIB} ${PLUGIN} ${PROG} install-extra .xpm.o:
${COMPILE_STATUS}
if ${CC} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
${COMPILE_OK}; \
else \
${COMPILE_FAILED}; \
fi
.xpm.lib.o:
${COMPILE_LIB_STATUS}
if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
${COMPILE_LIB_OK}; \
else \
${COMPILE_LIB_FAILED}; \
fi
.xpm.plugin.o:
${COMPILE_PLUGIN_STATUS}
if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
${COMPILE_PLUGIN_OK}; \
else \
${COMPILE_PLUGIN_FAILED}; \
fi
install: all install-extra
for i in ${SUBDIRS}; do \ for i in ${SUBDIRS}; do \
${DIR_ENTER}; \ ${DIR_ENTER}; \
${MAKE} ${MFLAGS} install || exit 1; \ ${MAKE} ${MFLAGS} install || exit $$?; \
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
for i in ${LIB}; do \ for i in ${SHARED_LIB}; do \
${INSTALL_STATUS}; \ ${INSTALL_STATUS}; \
if ${MKDIR_P} ${DESTDIR}${libdir} ${INSTALL_LIB}; then \ if ${MKDIR_P} ${DESTDIR}${libdir} ${INSTALL_LIB}; then \
${INSTALL_OK}; \ ${INSTALL_OK}; \
@ -422,7 +595,7 @@ install: ${LIB} ${STATIC_LIB} ${STATIC_PIC_LIB} ${PLUGIN} ${PROG} install-extra
for i in ${DATA}; do \ for i in ${DATA}; do \
${INSTALL_STATUS}; \ ${INSTALL_STATUS}; \
if ${MKDIR_P} $$(dirname ${DESTDIR}${datadir}/${PACKAGE}/$$i) && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \ if ${MKDIR_P} $$(dirname ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i) && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i; then \
${INSTALL_OK}; \ ${INSTALL_OK}; \
else \ else \
${INSTALL_FAILED}; \ ${INSTALL_FAILED}; \
@ -470,11 +643,11 @@ install-extra:
uninstall: uninstall-extra uninstall: uninstall-extra
for i in ${SUBDIRS}; do \ for i in ${SUBDIRS}; do \
${DIR_ENTER}; \ ${DIR_ENTER}; \
${MAKE} ${MFLAGS} uninstall || exit 1; \ ${MAKE} ${MFLAGS} uninstall || exit $$?; \
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
for i in ${LIB}; do \ for i in ${SHARED_LIB}; do \
if test -f ${DESTDIR}${libdir}/$$i; then \ if test -f ${DESTDIR}${libdir}/$$i; then \
if : ${UNINSTALL_LIB}; then \ if : ${UNINSTALL_LIB}; then \
${DELETE_OK}; \ ${DELETE_OK}; \
@ -506,16 +679,16 @@ uninstall: uninstall-extra
-rmdir ${DESTDIR}${plugindir} >/dev/null 2>&1 -rmdir ${DESTDIR}${plugindir} >/dev/null 2>&1
for i in ${DATA}; do \ for i in ${DATA}; do \
if test -f ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \ if test -f ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i; then \
if rm -f ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \ if rm -f ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i; then \
${DELETE_OK}; \ ${DELETE_OK}; \
else \ else \
${DELETE_FAILED}; \ ${DELETE_FAILED}; \
fi \ fi \
fi; \ fi; \
rmdir "$$(dirname ${DESTDIR}${datadir}/${PACKAGE}/$$i)" >/dev/null 2>&1 || true; \ rmdir "$$(dirname ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i)" >/dev/null 2>&1 || true; \
done done
-rmdir ${DESTDIR}${datadir}/${PACKAGE} >/dev/null 2>&1 -rmdir ${DESTDIR}${datadir}/${PACKAGE_NAME} >/dev/null 2>&1
for i in ${PROG}; do \ for i in ${PROG}; do \
if test -f ${DESTDIR}${bindir}/$$i; then \ if test -f ${DESTDIR}${bindir}/$$i; then \
@ -563,11 +736,11 @@ uninstall-extra:
clean: clean:
for i in ${SUBDIRS}; do \ for i in ${SUBDIRS}; do \
${DIR_ENTER}; \ ${DIR_ENTER}; \
${MAKE} ${MFLAGS} clean || exit 1; \ ${MAKE} ${MFLAGS} clean || exit $$?; \
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
for i in ${DEPS} ${OBJS} ${LIB_OBJS} ${PLUGIN_OBJS} ${PROG} ${PROG_NOINST} ${LIB} ${LIB_NOINST} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${CLEAN_LIB} ${MO_FILES} ${CLEAN}; do \ for i in ${DEPS} ${OBJS} ${OBJS_EXTRA} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${PLUGIN_OBJS} ${PROG} ${PROG_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${CLEAN_LIB} ${MO_FILES} ${CLEAN}; do \
if test -f $$i -o -d $$i; then \ if test -f $$i -o -d $$i; then \
if rm -fr $$i; then \ if rm -fr $$i; then \
${DELETE_OK}; \ ${DELETE_OK}; \
@ -580,7 +753,7 @@ clean:
distclean: clean distclean: clean
for i in ${SUBDIRS}; do \ for i in ${SUBDIRS}; do \
${DIR_ENTER}; \ ${DIR_ENTER}; \
${MAKE} ${MFLAGS} distclean || exit 1; \ ${MAKE} ${MFLAGS} distclean || exit $$?; \
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
@ -594,27 +767,27 @@ distclean: clean
fi \ fi \
done done
DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd $$i || exit 1 DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd $$i || exit $$?
DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd .. || exit 1 DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd .. || exit $$?
DEPEND_STATUS = printf "@TERM_EL@@TERM_SETAF3@Generating dependencies...@TERM_SGR0@\r" DEPEND_STATUS = printf "@TERM_EL@@TERM_SETAF3@Generating dependencies...@TERM_SGR0@\r"
DEPEND_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully generated dependencies.@TERM_SGR0@\n" DEPEND_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully generated dependencies.@TERM_SGR0@\n"
DEPEND_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to generate dependencies!@TERM_SGR0@\n"; exit 1 DEPEND_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to generate dependencies!@TERM_SGR0@\n"; exit $$err
COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r"
COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n"
COMPILE_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit 1 COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (lib)...@TERM_SGR0@\r" COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (lib)...@TERM_SGR0@\r"
COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (lib).@TERM_SGR0@\n" COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (lib).@TERM_SGR0@\n"
COMPILE_LIB_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n"; exit 1 COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n"; exit $$err
COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r" COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r"
COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n" COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n"
COMPILE_PLUGIN_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n"; exit 1 COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n"; exit $$err
LINK_STATUS = printf "@TERM_EL@@TERM_SETAF3@Linking @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" LINK_STATUS = printf "@TERM_EL@@TERM_SETAF3@Linking @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r"
LINK_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully linked @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" LINK_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully linked @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n"
LINK_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to link @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit 1 LINK_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to link @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3@Installing @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3@Installing @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r"
INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully installed @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully installed @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n"
INSTALL_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit 1 INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF4@.@TERM_SGR0@\n" DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF4@.@TERM_SGR0@\n"
DELETE_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit 1 DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
include .deps include .deps

22
m4/buildsys.m4
View file

@ -1,7 +1,8 @@
dnl dnl
dnl Copyright (c) 2007 - 2009, Jonathan Schleifer <js@webkeks.org> dnl Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012
dnl Jonathan Schleifer <js@webkeks.org>
dnl dnl
dnl https://webkeks.org/hg/buildsys/ dnl https://webkeks.org/git/?p=buildsys.git
dnl dnl
dnl Permission to use, copy, modify, and/or distribute this software for any dnl Permission to use, copy, modify, and/or distribute this software for any
dnl purpose with or without fee is hereby granted, provided that the above dnl purpose with or without fee is hereby granted, provided that the above
@ -21,6 +22,11 @@ dnl POSSIBILITY OF SUCH DAMAGE.
dnl dnl
AC_DEFUN([BUILDSYS_INIT], [ AC_DEFUN([BUILDSYS_INIT], [
AC_SUBST(CC_DEPENDS, $GCC)
AC_SUBST(CXX_DEPENDS, $GXX)
AC_SUBST(OBJC_DEPENDS, $GOBJC)
AC_SUBST(OBJCXX_DEPENDS, $GOBJCXX)
AC_PATH_PROG(TPUT, tput) AC_PATH_PROG(TPUT, tput)
AS_IF([test x"$TPUT" != x""], [ AS_IF([test x"$TPUT" != x""], [
@ -100,15 +106,15 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
LDFLAGS_RPATH='-Wl,-rpath,${libdir}' LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
PLUGIN_CFLAGS='-fPIC -DPIC' PLUGIN_CFLAGS='-fPIC -DPIC'
PLUGIN_LDFLAGS='-bundle -undefined dynamic_lookup' PLUGIN_LDFLAGS='-bundle -undefined dynamic_lookup'
PLUGIN_SUFFIX='.impl' PLUGIN_SUFFIX='.bundle'
INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i' INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && install_name_tool -id ${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i'
UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib' UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
CLEAN_LIB='' CLEAN_LIB=''
;; ;;
solaris*) solaris*)
AC_MSG_RESULT(Solaris) AC_MSG_RESULT(Solaris)
LIB_CFLAGS='-fPIC -DPIC' LIB_CFLAGS='-fPIC -DPIC'
LIB_LDFLAGS='-shared -Wl,-soname=${LIB}.${LIB_MAJOR}.${LIB_MINOR}' LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}.${LIB_MINOR}'
LIB_PREFIX='lib' LIB_PREFIX='lib'
LIB_SUFFIX='.so' LIB_SUFFIX='.so'
LDFLAGS_RPATH='-Wl,-rpath,${libdir}' LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
@ -136,7 +142,7 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
cygwin* | mingw*) cygwin* | mingw*)
AC_MSG_RESULT(Win32) AC_MSG_RESULT(Win32)
LIB_CFLAGS='' LIB_CFLAGS=''
LIB_LDFLAGS='-shared -Wl,--out-implib,${LIB}.a' LIB_LDFLAGS='-shared -Wl,--out-implib,${SHARED_LIB}.a'
LIB_PREFIX='lib' LIB_PREFIX='lib'
LIB_SUFFIX='.dll' LIB_SUFFIX='.dll'
LDFLAGS_RPATH='-Wl,-rpath,${libdir}' LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
@ -145,12 +151,12 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
PLUGIN_SUFFIX='.dll' PLUGIN_SUFFIX='.dll'
INSTALL_LIB='&& ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 $$i.a ${DESTDIR}${libdir}/$$i.a' INSTALL_LIB='&& ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 $$i.a ${DESTDIR}${libdir}/$$i.a'
UNINSTALL_LIB='&& rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/$$i.a' UNINSTALL_LIB='&& rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/$$i.a'
CLEAN_LIB='${LIB}.a' CLEAN_LIB='${SHARED_LIB}.a'
;; ;;
*) *)
AC_MSG_RESULT(GNU) AC_MSG_RESULT(GNU)
LIB_CFLAGS='-fPIC -DPIC' LIB_CFLAGS='-fPIC -DPIC'
LIB_LDFLAGS='-shared -Wl,-soname=${LIB}.${LIB_MAJOR}' LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}'
LIB_PREFIX='lib' LIB_PREFIX='lib'
LIB_SUFFIX='.so' LIB_SUFFIX='.so'
LDFLAGS_RPATH='-Wl,-rpath,${libdir}' LDFLAGS_RPATH='-Wl,-rpath,${libdir}'

4
src/Makefile
View file

@ -1,9 +1,9 @@
include ../extra.mk include ../extra.mk
LIB = ${OBJXMPP_SHARED_LIB} SHARED_LIB = ${OBJXMPP_SHARED_LIB}
STATIC_LIB = ${OBJXMPP_STATIC_LIB}
LIB_MAJOR = 0 LIB_MAJOR = 0
LIB_MINOR = 0 LIB_MINOR = 0
STATIC_LIB = ${OBJXMPP_STATIC_LIB}
SRCS = XMPPAuthenticator.m \ SRCS = XMPPAuthenticator.m \
XMPPCallback.m \ XMPPCallback.m \