ObjOpenSSL  Check-in [2c5a2c6dd7]

Overview
Comment:Adjust to new objfw-config package format
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 2c5a2c6dd75ccc43d09fbba55a9ec055728b2b0ef88216e131b7ece6659f3f14
User & Date: js on 2019-01-20 12:20:52
Other Links: manifest | tags
Context
2019-01-20
12:38
Update .gitignore check-in: 6662952826 user: js tags: trunk
12:20
Adjust to new objfw-config package format check-in: 2c5a2c6dd7 user: js tags: trunk
2019-01-17
23:12
Install package for objfw-config check-in: fb074fe047 user: js tags: trunk
Changes

Modified Makefile from [81e238dc9f] to [e6f7a5375b].

1
2
3
4
5
6
7

8
9
10
11
12
13
14
15
16
17

18
19
20
21
22
23

SUBDIRS = src

include buildsys.mk
include extra.mk

install-extra:
	i=packages/ObjOpenSSL; \

	${INSTALL_STATUS}; \
	if ${INSTALL} -m 644 $$i ${DESTDIR}$$(${OBJFW_CONFIG} --packages-dir)/ObjOpenSSL; then \
		${INSTALL_OK}; \
	else \
		${INSTALL_FAILED}; \
	fi

uninstall-extra:
	i=packages/ObjOpenSSL; \
	if test -f ${DESTDIR}$$(${OBJFW_CONFIG} --packages-dir)/ObjOpenSSL; then \

		if rm -f ${DESTDIR}$$(${OBJFW_CONFIG} --packages-dir)/ObjOpenSSL; then \
			${DELETE_OK}; \
		else \
			${DELETE_FAILED}; \
		fi \
	fi







|
>

|






|
|
>
|




|
>
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
SUBDIRS = src

include buildsys.mk
include extra.mk

install-extra:
	i=ObjOpenSSL.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=ObjOpenSSL.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 ObjOpenSSL.oc.in version [cfb10b0c38].







>
>
>
1
2
3
package_description 1
CPPFLAGS="$CPPFLAGS @OPENSSL_CPPFLAGS@"
LIBS="@OPENSSL_LIBS@ $LIBS"

Modified configure.ac from [57a463f7cf] to [660cbad068].

70
71
72
73
74
75
76
77
78
dnl and add OBJCPPFLAGS to CPPFLAGS, thus we need to AC_SUBST these ourself.
AC_SUBST(CPP)
AC_SUBST(CPPFLAGS)

AC_SUBST(OPENSSL_CPPFLAGS)
AC_SUBST(OPENSSL_LIBS)

AC_CONFIG_FILES([buildsys.mk extra.mk packages/ObjOpenSSL])
AC_OUTPUT







|

70
71
72
73
74
75
76
77
78
dnl and add OBJCPPFLAGS to CPPFLAGS, thus we need to AC_SUBST these ourself.
AC_SUBST(CPP)
AC_SUBST(CPPFLAGS)

AC_SUBST(OPENSSL_CPPFLAGS)
AC_SUBST(OPENSSL_LIBS)

AC_CONFIG_FILES([buildsys.mk extra.mk ObjOpenSSL.oc])
AC_OUTPUT

Deleted packages/ObjOpenSSL.in version [dac9b47257].

1
2
3
package_version 1
CPPFLAGS="$CPPFLAGS @OPENSSL_CPPFLAGS@"
LIBS="@OPENSSL_LIBS@ $LIBS"
<
<
<