diff --git a/Makefile b/Makefile index f798985..dc5ece8 100644 --- a/Makefile +++ b/Makefile @@ -3,3 +3,26 @@ SUBDIRS = src tests tests: src include buildsys.mk +include extra.mk + +install-extra: + i=ObjXMPP.oc; \ + packagesdir="${DESTDIR}$$(${OBJFW_CONFIG} --packages-dir)"; \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} $$packagesdir && ${INSTALL} -m 644 $$i $$packagesdir/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi + +uninstall-extra: + i=ObjXMPP.oc; \ + packagesdir="${DESTDIR}$$(${OBJFW_CONFIG} --packages-dir)"; \ + if test -f $$packagesdir/$$i; then \ + if rm -f $$packagesdir/$$i; then \ + ${DELETE_OK}; \ + else \ + ${DELETE_FAILED}; \ + fi \ + fi; \ + rmdir $$packagesdir >/dev/null 2>&1 || true diff --git a/ObjXMPP.oc b/ObjXMPP.oc new file mode 100644 index 0000000..7c6788b --- /dev/null +++ b/ObjXMPP.oc @@ -0,0 +1,3 @@ +package_description 1 +package_depends_on ObjOpenSSL +LIBS="-lobjxmpp $LIBS" diff --git a/configure.ac b/configure.ac index e78094d..91510d6 100644 --- a/configure.ac +++ b/configure.ac @@ -27,13 +27,14 @@ AS_IF([$OBJFW_CONFIG --package ObjOpenSSL 2>/dev/null], [ AC_MSG_ERROR(You need ObjOpenSSL installed!) ]) -OBJFW_CONFIG="$OBJFW_CONFIG --package ObjOpenSSL" +packages="--package ObjOpenSSL" CPP="$OBJCPP" -CPPFLAGS="$CPPFLAGS $OBJCPPFLAGS $($OBJFW_CONFIG --cppflags)" -OBJCFLAGS="$OBJCFLAGS -Wall $($OBJFW_CONFIG --objcflags)" -LDFLAGS="$LDFLAGS $($OBJFW_CONFIG --ldflags)" -AC_SUBST(OBJFW_LIBS, "$LIBS $($OBJFW_CONFIG --libs)") -AC_SUBST(OBJFW_FRAMEWORK_LIBS, "$LIBS $($OBJFW_CONFIG --framework-libs)") +CPPFLAGS="$CPPFLAGS $OBJCPPFLAGS $($OBJFW_CONFIG $packages --cppflags)" +OBJCFLAGS="$OBJCFLAGS -Wall $($OBJFW_CONFIG $packages --objcflags)" +LDFLAGS="$LDFLAGS $($OBJFW_CONFIG $packages --ldflags)" +AC_SUBST(OBJFW_LIBS, "$LIBS $($OBJFW_CONFIG $packages --libs)") +AC_SUBST(OBJFW_FRAMEWORK_LIBS, + "$LIBS $($OBJFW_CONFIG $packages --framework-libs)") AX_CHECK_COMPILER_FLAGS(-Watomic-properties, [OBJCFLAGS="$OBJCFLAGS -Watomic-properties"]) diff --git a/extra.mk.in b/extra.mk.in index ce721a8..cc6dd6c 100644 --- a/extra.mk.in +++ b/extra.mk.in @@ -2,6 +2,7 @@ OBJXMPP_SHARED_LIB = @OBJXMPP_SHARED_LIB@ OBJXMPP_STATIC_LIB = @OBJXMPP_STATIC_LIB@ OBJXMPP_FRAMEWORK = @OBJXMPP_FRAMEWORK@ +OBJFW_CONFIG = @OBJFW_CONFIG@ OBJFW_FRAMEWORK_LIBS = @OBJFW_FRAMEWORK_LIBS@ OBJFW_LIBS = @OBJFW_LIBS@ OBJOPENSSL_FRAMEWORK_LIBS = @OBJOPENSSL_FRAMEWORK_LIBS@