Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 149739 | Differences between
and this patch

Collapse All | Expand All

(-)gyachi2/plugins/Makefile.am (-5 lines)
Lines 3-9 Link Here
3
    gyachimcrypt.so \
3
    gyachimcrypt.so \
4
    gyachiblowfish.so \
4
    gyachiblowfish.so \
5
    gyachigpgme.so \
5
    gyachigpgme.so \
6
    gyachixmms.so
7
6
8
7
9
plugindir = $(pkgdatadir)/plugins
8
plugindir = $(pkgdatadir)/plugins
Lines 24-33 Link Here
24
gyachigpgme_so_LDADD = @GTK_LIBS@ -lgpgme
23
gyachigpgme_so_LDADD = @GTK_LIBS@ -lgpgme
25
gyachigpgme_so_LDFLAGS = -shared -fpic -fPIC
24
gyachigpgme_so_LDFLAGS = -shared -fpic -fPIC
26
25
27
gyachixmms_so_SOURCES = gyachi-xmms.c
28
gyachixmms_so_LDADD = @GTK_LIBS@ -lxmms
29
gyachixmms_so_LDFLAGS = -shared -fpic -fPIC -Xlinker -Bdynamic -Wl,--export-dynamic
30
31
# Required for localization
26
# Required for localization
32
localedir = $(datadir)/locale
27
localedir = $(datadir)/locale
33
28
(-)gyachi2/plugins/Makefile.in (-16 / +3 lines)
Lines 37-44 Link Here
37
build_triplet = @build@
37
build_triplet = @build@
38
host_triplet = @host@
38
host_triplet = @host@
39
plugin_PROGRAMS = gyachiphotos.so$(EXEEXT) gyachimcrypt.so$(EXEEXT) \
39
plugin_PROGRAMS = gyachiphotos.so$(EXEEXT) gyachimcrypt.so$(EXEEXT) \
40
	gyachiblowfish.so$(EXEEXT) gyachigpgme.so$(EXEEXT) \
40
	gyachiblowfish.so$(EXEEXT) gyachigpgme.so$(EXEEXT)
41
	gyachixmms.so$(EXEEXT)
42
subdir = plugins
41
subdir = plugins
43
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
42
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
44
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
43
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
Lines 63-71 Link Here
63
am_gyachiphotos_so_OBJECTS = gyachi-photos.$(OBJEXT)
62
am_gyachiphotos_so_OBJECTS = gyachi-photos.$(OBJEXT)
64
gyachiphotos_so_OBJECTS = $(am_gyachiphotos_so_OBJECTS)
63
gyachiphotos_so_OBJECTS = $(am_gyachiphotos_so_OBJECTS)
65
gyachiphotos_so_DEPENDENCIES =
64
gyachiphotos_so_DEPENDENCIES =
66
am_gyachixmms_so_OBJECTS = gyachi-xmms.$(OBJEXT)
67
gyachixmms_so_OBJECTS = $(am_gyachixmms_so_OBJECTS)
68
gyachixmms_so_DEPENDENCIES =
69
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
65
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
70
depcomp = $(SHELL) $(top_srcdir)/depcomp
66
depcomp = $(SHELL) $(top_srcdir)/depcomp
71
am__depfiles_maybe = depfiles
67
am__depfiles_maybe = depfiles
Lines 78-88 Link Here
78
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
74
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
79
	$(AM_LDFLAGS) $(LDFLAGS) -o $@
75
	$(AM_LDFLAGS) $(LDFLAGS) -o $@
80
SOURCES = $(gyachiblowfish_so_SOURCES) $(gyachigpgme_so_SOURCES) \
76
SOURCES = $(gyachiblowfish_so_SOURCES) $(gyachigpgme_so_SOURCES) \
81
	$(gyachimcrypt_so_SOURCES) $(gyachiphotos_so_SOURCES) \
77
	$(gyachimcrypt_so_SOURCES) $(gyachiphotos_so_SOURCES)
82
	$(gyachixmms_so_SOURCES)
83
DIST_SOURCES = $(gyachiblowfish_so_SOURCES) $(gyachigpgme_so_SOURCES) \
78
DIST_SOURCES = $(gyachiblowfish_so_SOURCES) $(gyachigpgme_so_SOURCES) \
84
	$(gyachimcrypt_so_SOURCES) $(gyachiphotos_so_SOURCES) \
79
	$(gyachimcrypt_so_SOURCES) $(gyachiphotos_so_SOURCES)
85
	$(gyachixmms_so_SOURCES)
86
ETAGS = etags
80
ETAGS = etags
87
CTAGS = ctags
81
CTAGS = ctags
88
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
82
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
Lines 255-263 Link Here
255
gyachigpgme_so_SOURCES = gyachi-gpgme.c
249
gyachigpgme_so_SOURCES = gyachi-gpgme.c
256
gyachigpgme_so_LDADD = @GTK_LIBS@ -lgpgme
250
gyachigpgme_so_LDADD = @GTK_LIBS@ -lgpgme
257
gyachigpgme_so_LDFLAGS = -shared -fpic -fPIC
251
gyachigpgme_so_LDFLAGS = -shared -fpic -fPIC
258
gyachixmms_so_SOURCES = gyachi-xmms.c
259
gyachixmms_so_LDADD = @GTK_LIBS@ -lxmms
260
gyachixmms_so_LDFLAGS = -shared -fpic -fPIC -Xlinker -Bdynamic -Wl,--export-dynamic
261
252
262
# Required for localization
253
# Required for localization
263
localedir = $(datadir)/locale
254
localedir = $(datadir)/locale
Lines 335-343 Link Here
335
gyachiphotos.so$(EXEEXT): $(gyachiphotos_so_OBJECTS) $(gyachiphotos_so_DEPENDENCIES) 
326
gyachiphotos.so$(EXEEXT): $(gyachiphotos_so_OBJECTS) $(gyachiphotos_so_DEPENDENCIES) 
336
	@rm -f gyachiphotos.so$(EXEEXT)
327
	@rm -f gyachiphotos.so$(EXEEXT)
337
	$(LINK) $(gyachiphotos_so_LDFLAGS) $(gyachiphotos_so_OBJECTS) $(gyachiphotos_so_LDADD) $(LIBS)
328
	$(LINK) $(gyachiphotos_so_LDFLAGS) $(gyachiphotos_so_OBJECTS) $(gyachiphotos_so_LDADD) $(LIBS)
338
gyachixmms.so$(EXEEXT): $(gyachixmms_so_OBJECTS) $(gyachixmms_so_DEPENDENCIES) 
339
	@rm -f gyachixmms.so$(EXEEXT)
340
	$(LINK) $(gyachixmms_so_LDFLAGS) $(gyachixmms_so_OBJECTS) $(gyachixmms_so_LDADD) $(LIBS)
341
329
342
mostlyclean-compile:
330
mostlyclean-compile:
343
	-rm -f *.$(OBJEXT)
331
	-rm -f *.$(OBJEXT)
Lines 349-355 Link Here
349
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gyachi-gpgme.Po@am__quote@
337
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gyachi-gpgme.Po@am__quote@
350
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gyachi-mcrypt.Po@am__quote@
338
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gyachi-mcrypt.Po@am__quote@
351
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gyachi-photos.Po@am__quote@
339
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gyachi-photos.Po@am__quote@
352
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gyachi-xmms.Po@am__quote@
353
340
354
.c.o:
341
.c.o:
355
@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
342
@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
(-)gyachi2/plugins/gyachi-gpgme.c (-1 / +1 lines)
Lines 24-30 Link Here
24
 *****************************************************************************/
24
 *****************************************************************************/
25
25
26
#include "plugin_api.h"
26
#include "plugin_api.h"
27
#include <gpgme.h>
27
#include <gpgme/gpgme.h>
28
#include <stdio.h>
28
#include <stdio.h>
29
#include <stdlib.h>
29
#include <stdlib.h>
30
#include <string.h>
30
#include <string.h>

Return to bug 149739