Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -1,5 +1,28 @@ 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 ADDED ObjXMPP.oc Index: ObjXMPP.oc ================================================================== --- ObjXMPP.oc +++ ObjXMPP.oc @@ -0,0 +1,3 @@ +package_description 1 +package_depends_on ObjOpenSSL +LIBS="-lobjxmpp $LIBS" Index: configure.ac ================================================================== --- configure.ac +++ configure.ac @@ -25,17 +25,18 @@ ], [ AC_MSG_RESULT(no) 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"]) AX_CHECK_COMPILER_FLAGS(-Wdocumentation, [OBJCFLAGS="$OBJCFLAGS -Wdocumentation"]) Index: extra.mk.in ================================================================== --- extra.mk.in +++ extra.mk.in @@ -1,8 +1,9 @@ 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@ OBJOPENSSL_LIBS = @OBJOPENSSL_LIBS@