Cypher_Stack/libsecret
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libsecret.git synced 2024-12-22 04:38:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsecret: Don't use non-portable sed -i shell command

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=720087
This commit is contained in:
Stef Walter 2013-12-11 09:41:27 +01:00
parent 482dc34d74
commit 8d297361de
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -70,7 +70,7 @@ stamp*
/egg/tests/test-* /egg/tests/test-*
!/egg/tests/test-*.c !/egg/tests/test-*.c
/libsecret/secret-dbus-generated.[ch] /libsecret/*-dbus-generated.[ch]
/libsecret/secret-enum-types.[ch] /libsecret/secret-enum-types.[ch]
/libsecret/tests/test-* /libsecret/tests/test-*
/libsecret/tests/*.metadata /libsecret/tests/*.metadata

19
libsecret/Makefile.am
View File

@ -91,13 +91,18 @@ libsecret_testable_la_LDFLAGS = -rpath /force/shared
DBUS_XML_DEFINITIONS = \ DBUS_XML_DEFINITIONS = \
$(srcdir)/org.freedesktop.Secrets.xml $(srcdir)/org.freedesktop.Secrets.xml
secret-dbus-generated.c: $(DBUS_XML_DEFINITIONS) Makefile.am temp-dbus-generated.c: $(DBUS_XML_DEFINITIONS) Makefile.am
$(AM_V_GEN) gdbus-codegen --interface-prefix org.freedesktop.Secret. \ $(AM_V_GEN) gdbus-codegen --interface-prefix org.freedesktop.Secret. \
--generate-c-code secret-dbus-generated --c-namespace SecretGen \ --generate-c-code temp-dbus-generated --c-namespace SecretGen \
$(DBUS_XML_DEFINITIONS) $(DBUS_XML_DEFINITIONS)
$(AM_V_GEN) sed -i -e 's/secret_gen_/_secret_gen_/g' -e 's/type-/type/g' secret-dbus-generated.[ch] secret-dbus-generated.c: temp-dbus-generated.c Makefile.am
$(AM_V_GEN) sed -i -e '1i #define GLIB_DISABLE_DEPRECATION_WARNINGS' secret-dbus-generated.c $(AM_V_GEN) sed -e '1i #define GLIB_DISABLE_DEPRECATION_WARNINGS' \
secret-dbus-generated.h: secret-dbus-generated.c -e 's/secret_gen_/_secret_gen_/g' -e 's/type-/type/g' \
-e 's/temp-dbus-generated.h/secret-dbus-generated.h/g' \
temp-dbus-generated.c > secret-dbus-generated.c
secret-dbus-generated.h: temp-dbus-generated.c Makefile.am
$(AM_V_GEN) sed -e 's/secret_gen_/_secret_gen_/g' -e 's/type-/type/g' \
temp-dbus-generated.h > secret-dbus-generated.h
secret-enum-types.h: secret-enum-types.h.template $(HEADER_FILES) secret-enum-types.h: secret-enum-types.h.template $(HEADER_FILES)
$(AM_V_GEN) $(GLIB_MKENUMS) --template $^ > $@ $(AM_V_GEN) $(GLIB_MKENUMS) --template $^ > $@
@ -212,9 +217,13 @@ CLEANFILES += \
$(pkgconfig_DATA) \ $(pkgconfig_DATA) \
$(gir_DATA) \ $(gir_DATA) \
$(typelibs_DATA) \ $(typelibs_DATA) \
temp-dbus-generated.c \
temp-dbus-generated.h \
$(NULL) $(NULL)
DISTCLEANFILES = \ DISTCLEANFILES = \
secret-dbus-generated.c \
secret-dbus-generated.h \
$(NULL) $(NULL)
check-memory: check-memory: