Download as
Browse Code »

Commit 229adf28150a6f8799ac1cf8a3dccc8afd71d162

Authored by Perry Werneck
1 parent 38c9c57f
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Reincluindo plugin D-Bus.

Showing 6 changed files with 167 additions and 108 deletions   Show diff stats
Makefile.in
  Diff comments   View file @229adf2
... ... @@ -30,6 +30,7 @@ PACKAGE_NAME=@PACKAGE_NAME@
30 30 PACKAGE_VERSION=@PACKAGE_VERSION@
31 31 PACKAGE_LEVEL=@PACKAGE_LEVEL@
32 32 PACKAGE_TARNAME=@PACKAGE_TARNAME@
  33 +PLUGINS=@PLUGINS@
33 34  
34 35 #---[ Paths ]------------------------------------------------------------------
35 36  
... ... @@ -72,6 +73,12 @@ $(BINDBG)/%@DLLEXT@: \
72 73  
73 74 @$(MAKE) -C src/$(basename $(notdir $@)) $@
74 75  
  76 +$(BINDBG)/plugins/%@DLLEXT@: \
  77 + $(DEPENDS) \
  78 + ./src/plugins/%/*
  79 +
  80 + @$(MAKE) -C src/plugins/$(basename $(notdir $@)) $@
  81 +
75 82 $(BINDBG)/%@EXEEXT@: \
76 83 $(DEPENDS) \
77 84 ./src/%/*
... ... @@ -84,6 +91,12 @@ $(BINRLS)/%@DLLEXT@: \
84 91  
85 92 @$(MAKE) -C src/$(basename $(notdir $@)) $@
86 93  
  94 +$(BINRLS)/plugins/%@DLLEXT@: \
  95 + $(DEPENDS) \
  96 + ./src/plugins/%/*
  97 +
  98 + @$(MAKE) -C src/plugins/$(basename $(notdir $@)) $@
  99 +
87 100 $(POTDIR)/%.pot: \
88 101 $(DEPENDS) \
89 102 ./src/%/*
... ... @@ -140,11 +153,13 @@ $(SRCDIR)/%: \
140 153 all: \
141 154 $(BINRLS)/lib3270@DLLEXT@ \
142 155 $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \
  156 + $(foreach PLG, $(PLUGINS), $(BINRLS)/plugins/$(PLG)@DLLEXT@) \
143 157 locale/$(PACKAGE_TARNAME).pot
144 158  
145 159 Release: \
146 160 $(BINRLS)/lib3270@DLLEXT@ \
147 161 $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \
  162 + $(foreach PLG, $(PLUGINS), $(BINRLS)/plugins/$(PLG)@DLLEXT@) \
148 163 locale/$(PACKAGE_TARNAME).pot
149 164  
150 165 locale/$(PACKAGE_TARNAME).pot: \
... ... @@ -172,11 +187,13 @@ install: \
172 187  
173 188 Debug: \
174 189 $(BINDBG)/lib3270@DLLEXT@ \
175   - $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@
  190 + $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ \
  191 + $(foreach PLG, $(PLUGINS), $(BINDBG)/plugins/$(PLG)@DLLEXT@)
176 192  
177 193 run: \
178 194 $(BINDBG)/lib3270@DLLEXT@ \
179   - $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@
  195 + $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ \
  196 + $(foreach PLG, $(PLUGINS), $(BINDBG)/plugins/$(PLG)@DLLEXT@)
180 197  
181 198 @LD_LIBRARY_PATH=$(BINDBG) $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@
182 199  
... ...
configure.ac
  Diff comments   View file @229adf2
... ... @@ -67,6 +67,7 @@ dnl ---------------------------------------------------------------------------
67 67  
68 68 DBG_CFLAGS="-g -fstack-check -DDEBUG=1"
69 69 RLS_CFLAGS="-DNDEBUG=1"
  70 +PLUGINS=""
70 71  
71 72 dnl ---------------------------------------------------------------------------
72 73 dnl Check for OS specifics
... ... @@ -129,6 +130,8 @@ dnl ---------------------------------------------------------------------------
129 130 AC_PATH_TOOL([RPMBUILD], [rpmbuild], [no])
130 131 AC_PATH_TOOL([MAKENSIS], [makensis], [no])
131 132 AC_PATH_TOOL([AR], [ar], [ar])
  133 +AC_PATH_TOOL([WINDRES], [windres], [no])
  134 +AC_PATH_TOOL([DBUSBINDINGTOOL],[dbus-binding-tool],[no])
132 135  
133 136 PKG_CHECK_EXISTS
134 137  
... ... @@ -152,10 +155,22 @@ dnl ---------------------------------------------------------------------------
152 155 dnl Check for D-Bus
153 156 dnl ---------------------------------------------------------------------------
154 157  
155   -PKG_CHECK_MODULES( [DBUS], [dbus-1], AC_DEFINE(HAVE_DBUS), AC_MSG_NOTICE([ No DBUS support.]) )
  158 +PKG_CHECK_MODULES( [DBUS], [dbus-1], app_cv_libdbus=yes, AC_MSG_NOTICE([ No DBUS support.]) )
156 159 AC_SUBST(DBUS_LIBS)
157 160 AC_SUBST(DBUS_CFLAGS)
158 161  
  162 +PKG_CHECK_MODULES( [GDBUS], [dbus-glib-1], app_cv_dbus=yes, AC_MSG_NOTICE([No GDBUS support.]) )
  163 +AC_SUBST(GDBUS_LIBS)
  164 +AC_SUBST(GDBUS_CFLAGS)
  165 +
  166 +if test "$app_cv_dbus" == "yes"; then
  167 +
  168 + AC_DEFINE(HAVE_DBUS)
  169 + AC_CONFIG_FILES(src/plugins/dbus3270/Makefile)
  170 + PLUGINS="$PLUGINS dbus3270"
  171 +
  172 +fi
  173 +
159 174 dnl ---------------------------------------------------------------------------
160 175 dnl Check for libintl
161 176 dnl ---------------------------------------------------------------------------
... ... @@ -279,6 +294,7 @@ dnl ---------------------------------------------------------------------------
279 294  
280 295 AC_SUBST(LIB3270_CFLAGS,-I$ac_pwd/src/include)
281 296 AC_SUBST(LIB3270_LIBS,-l3270)
  297 +AC_SUBST(PW3270_LIBS,-lpw3270)
282 298  
283 299 dnl ---------------------------------------------------------------------------
284 300 dnl Check for headers
... ... @@ -327,6 +343,7 @@ dnl Output config
327 343 dnl ---------------------------------------------------------------------------
328 344  
329 345 AC_SUBST(BASEDIR,$ac_pwd)
  346 +AC_SUBST(PLUGINS)
330 347  
331 348 dnl ---------------------------------------------------------------------------
332 349 dnl Configure which files to generate.
... ...
locale/pw3270.pot
  Diff comments   View file @229adf2
... ... @@ -9,7 +9,7 @@ msgstr ""
9 9 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
10 10 "Project-Id-Version: PACKAGE VERSION\n"
11 11 "Report-Msgid-Bugs-To: \n"
12   -"POT-Creation-Date: 2017-01-18 17:33-0200\n"
  12 +"POT-Creation-Date: 2017-01-19 09:59-0200\n"
13 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14 14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15 15 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -20,7 +20,7 @@ msgstr &quot;&quot;
20 20 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
21 21 "Project-Id-Version: PACKAGE VERSION\n"
22 22 "Report-Msgid-Bugs-To: \n"
23   -"POT-Creation-Date: 2017-01-18 17:33-0200\n"
  23 +"POT-Creation-Date: 2017-01-19 09:59-0200\n"
24 24 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
25 25 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
26 26 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
src/plugins/dbus3270/Makefile.in
  Diff comments   View file @229adf2
... ... @@ -22,150 +22,171 @@
22 22 #
23 23 # perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
24 24 # erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça)
25   -# licinio@bb.com.br (Licínio Luis Branco)
26   -# kraucer@bb.com.br (Kraucer Fernandes Mazuco)
27 25 #
28 26  
  27 +MODULE_NAME=dbus3270
  28 +
  29 +SOURCES=main.c gobject.c misc.c
  30 +# DAEMON_SRC=daemon.c gobject.c iocallback.c misc.c
  31 +
  32 +#---[ Configuration values ]-------------------------------------------------------------
  33 +
29 34 PACKAGE_NAME=@PACKAGE_NAME@
  35 +PACKAGE_VERSION=@PACKAGE_VERSION@
30 36 PACKAGE_TARNAME=@PACKAGE_TARNAME@
31   -MODULE_NAME=dbus3270
32 37  
33 38 prefix=@prefix@
34 39 exec_prefix=@exec_prefix@
35 40 bindir=@bindir@
  41 +sbindir=@sbindir@
36 42 libdir=@libdir@
37   -datarootdir=@datarootdir@
38   -localedir=@localedir@
39   -
40   -#---[ Sources ]----------------------------------------------------------------
41   -
42   -DEPENDS=Makefile dbus-glue.h
43   -PLUGIN_SRC=main.c gobject.c misc.c
44   -DAEMON_SRC=daemon.c gobject.c iocallback.c misc.c
45   -
46   -#---[ Paths ]------------------------------------------------------------------
47 43  
48   -ROOTDIR ?= .
49   -OBJDIR ?= $(ROOTDIR)/.obj
50   -BINDIR ?= $(ROOTDIR)/.bin
51   -BINDBG ?= $(BINDIR)/Debug
52   -BINRLS ?= $(BINDIR)/Release
  44 +BASEDIR=@BASEDIR@
  45 +SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/src/plugins/$(MODULE_NAME)
  46 +POTDIR=$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/plugins/$(MODULE_NAME)
53 47  
54   -OBJDBG = $(OBJDIR)/Debug
55   -OBJRLS = $(OBJDIR)/Release
56   -OBJEXT = o
  48 +OBJDIR=$(BASEDIR)/src/pw3270/.obj
  49 +OBJDBG=$(OBJDIR)/Debug/plugins/$(MODULE_NAME)
  50 +OBJRLS=$(OBJDIR)/Release/plugins/$(MODULE_NAME)
57 51  
58   -#---[ Tools ]------------------------------------------------------------------
  52 +BINDIR=$(BASEDIR)/.bin
  53 +BINDBG=$(BINDIR)/Debug/plugins
  54 +BINRLS=$(BINDIR)/Release/plugins
59 55  
60 56 MKDIR=@MKDIR_P@
61 57 CC=@CC@
62 58 LD=@CC@
  59 +AR=@AR@
63 60 DBUSBINDINGTOOL=@DBUSBINDINGTOOL@
  61 +XGETTEXT=@XGETTEXT@
  62 +MSGCAT=@MSGCAT@
64 63 INSTALL=@INSTALL@
65   -INSTALL_PROGRAM=@INSTALL_PROGRAM@
66 64 INSTALL_DATA=@INSTALL_DATA@
67 65  
68   -#---[ Flags ]------------------------------------------------------------------
  66 +CFLAGS=@CFLAGS@ @GTK_CFLAGS@ -I$(BASEDIR)/src/include
  67 +LIBS=@LIBS@ @GTK_LIBS@ @GLIB_LIBS@ @GDBUS_LIBS@ @LIB3270_LIBS@ @PW3270_LIBS@
69 68  
70   -LIB3270_MODE ?= Default
  69 +#---[ Rules ]----------------------------------------------------------------------------
71 70  
72   -DLL_FLAGS=-shared
73   -DLL_CFLAGS=@DLL_CFLAGS@
74   -DEBUG_CFLAGS=-DDEBUG=1 -g -Wall
  71 +DEPENDS=dbus-glue.h globals.h service.h Makefile
75 72  
76   -GDBUS_CFLAGS=@GDBUS_CFLAGS@
77   -GLIB_CFLAGS=@GLIB_CFLAGS@
78   -GTK_CFLAGS=@GTK_CFLAGS@
  73 +$(OBJDBG)/%.o: \
  74 + %.c \
  75 + $(DEPENDS)
79 76  
80   -GDBUS_LIBS=@GDBUS_LIBS@
81   -GLIB_LIBS=@GLIB_LIBS@
82   -GTK_LIBS=@GTK_LIBS@
  77 + @echo $< ...
  78 + @$(MKDIR) `dirname $@`
  79 + @$(CC) $(CFLAGS) \
  80 + @DBG_CFLAGS@ \
  81 + -DBUILD_DATE=`date +"0x%Y%m%d"`\
  82 + -o $@ -c $<
83 83  
84   -PW3270_CFLAGS=@PW3270_CFLAGS@
85   -LIB3270_CFLAGS=@LIB3270_CFLAGS@
  84 +$(OBJRLS)/%.o: \
  85 + %.c \
  86 + $(DEPENDS)
86 87  
87   -ifeq ($(LIB3270_MODE),Debug)
88   - PW3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l$(PACKAGE_TARNAME)
89   - LIB3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l3270
90   -endif
  88 + @echo $< ...
  89 + @$(MKDIR) `dirname $@`
  90 + @$(CC) $(CFLAGS) \
  91 + @RLS_CFLAGS@ \
  92 + -DBUILD_DATE=`date +"0x%Y%m%d"` \
  93 + -o $@ -c $<
91 94  
92   -ifeq ($(LIB3270_MODE),Release)
93   - PW3270_LIBS=-L../../../.bin/Release@DLLDIR@ -l$(PACKAGE_TARNAME)
94   - LIB3270_LIBS=-L../../../.bin/Release@DLLDIR@ -l3270
95   -endif
  95 +$(POTDIR)/%.pot: %.c
96 96  
97   -#ifeq ($(LIB3270_MODE),Default)
98   -# LIB3270_LIBS ?= `pkg-config --libs lib3270`
99   -# LIB3270_CFLAGS ?= `pkg-config --cflags lib3270`
100   -# PW3270_LIBS ?= `pkg-config --libs pw3270 lib3270`
101   -# PW3270_CFLAGS ?= `pkg-config --cflags pw3270 lib3270`
102   -#endif
  97 + @echo $(notdir $@) ...
  98 + @$(MKDIR) `dirname $@`
  99 + @$(XGETTEXT) \
  100 + --default-domain=$(PACKAGE) \
  101 + --language=C \
  102 + --keyword=_ \
  103 + --keyword=N_ \
  104 + --keyword=MSG_:2 \
  105 + --output=$@ \
  106 + $<
103 107  
104   -#---[ Rules ]------------------------------------------------------------------
  108 + @touch $@
105 109  
106   -$(OBJDBG)/%.o: \
107   - %.c $(DEPENDS)
  110 +dbus-glue.h: \
  111 + pw3270dbus.xml
108 112  
109   - @echo " CC `basename $@`"
110   - @$(MKDIR) `dirname $@`
111   - @$(CC) $(CFLAGS) \
112   - $(DLL_CFLAGS) $(GDBUS_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(DEBUG_CFLAGS) \
113   - $(LIB3270_CFLAGS) $(PW3270_CFLAGS) -o $@ -c $<
  113 + @echo $@ ...
  114 + @$(DBUSBINDINGTOOL) \
  115 + --mode=glib-server \
  116 + --output=$@ \
  117 + --prefix=pw3270_dbus $^
114 118  
115   -$(OBJRLS)/%.o: \
116   - %.c $(DEPENDS)
117 119  
118   - @echo " CC `basename $@`"
  120 +#---[ Release Targets ]------------------------------------------------------------------
  121 +
  122 +Release: \
  123 + $(BINRLS)/$(MODULE_NAME)@DLLEXT@
  124 +
  125 +$(BINRLS)/$(MODULE_NAME)@DLLEXT@: \
  126 + $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o)
  127 +
  128 + @echo $@ ...
119 129 @$(MKDIR) `dirname $@`
120   - @$(CC) $(CFLAGS) $(DLL_CFLAGS) $(GDBUS_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) \
121   - $(LIB3270_CFLAGS) $(PW3270_CFLAGS) -o $@ -c $<
  130 + @$(LD) \
  131 + -shared \
  132 + -L$(BASEDIR)/.bin/Release \
  133 + -o $@ $^ \
  134 + $(LIBS)
122 135  
123 136  
124   -#---[ Release targets ]--------------------------------------------------------
  137 +pot: \
  138 + $(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot
125 139  
126   -Release: $(BINRLS)/plugins/$(MODULE_NAME).so
  140 +$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot: \
  141 + $(foreach SRC, $(basename $(SOURCES)), $(POTDIR)/$(SRC).pot)
127 142  
128   -$(BINRLS)/plugins/$(MODULE_NAME).so: $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o)
129   - @echo " CCLD `basename $@`"
130   - @$(MKDIR) `dirname $@`
131   - @$(LD) $(DLL_FLAGS) -Wl,-soname,`basename $@` $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(PW3270_LIBS) $(GLIB_LIBS) $(GTK_LIBS) $(GDBUS_LIBS)
  143 + @rm -f $@
  144 + @mkdir -p `dirname $@`
  145 + @$(MSGCAT) --sort-output $^ > $@
  146 +
  147 +$(SRCDIR): \
  148 + clean
  149 +
  150 + @$(MKDIR) $@
  151 + @$(INSTALL_DATA) *.c *.h *.xml *.cbp $@
132 152  
133   -$(BINRLS)/@PACKAGE_NAME@d: $(foreach SRC, $(basename $(DAEMON_SRC)), $(OBJRLS)/$(SRC).o)
134   - @echo " CCLD `basename $@`"
135   - @$(MKDIR) `dirname $@`
136   - @$(CC) $(CFLAGS) -o $@ $^ $(GDBUS_LIBS) $(GLIB_LIBS) $(LIB3270_LIBS)
137 153  
138   -#---[ Debug targets ]----------------------------------------------------------
  154 +#---[ Debug Targets ]--------------------------------------------------------------------
139 155  
140   -Debug: $(BINDBG)/plugins/$(MODULE_NAME).so
  156 +Debug: \
  157 + $(BINDBG)/$(MODULE_NAME)@DLLEXT@
141 158  
142   -$(BINDBG)/plugins/$(MODULE_NAME).so: $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJDBG)/$(SRC).o)
143   - @echo " CCLD `basename $@`"
  159 +$(BINDBG)/$(MODULE_NAME)@DLLEXT@: \
  160 + $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o)
  161 +
  162 + @echo $@ ...
144 163 @$(MKDIR) `dirname $@`
145   - @$(LD) $(DLL_FLAGS) @DBGRPATH@ -Wl,-soname,`basename $@` $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(PW3270_LIBS) $(GLIB_LIBS) $(GTK_LIBS) $(GDBUS_LIBS)
  164 + @$(LD) \
  165 + -shared \
  166 + -Wl,-soname,`basename $@`,--rpath,$(BASEDIR)/.bin/Debug \
  167 + -L$(BASEDIR)/.bin/Debug \
  168 + -o $@ $^ \
  169 + $(LIBS)
146 170  
147   -#---[ Misc targets ]-----------------------------------------------------------
148 171  
149   -install:
150   - @$(MKDIR) $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins
151   - @$(INSTALL_PROGRAM) $(BINRLS)/plugins/$(MODULE_NAME).so $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins
  172 +#---[ Clean Targets]---------------------------------------------------------------------
152 173  
153   -debug-service: $(BINDBG)/@PACKAGE_NAME@d
  174 +cleanDebug:
154 175  
155   -dbus-glue.h: pw3270dbus.xml
156   - @$(MKDIR) .tmp
157   - @$(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=pw3270_dbus $^
  176 + @rm -fr $(BINDBG)/$(MODULE_NAME)@DLLEXT@ \
  177 + $(OBJDBG) \
  178 + dbus-glue.h
158 179  
159   -$(BINDBG)/@PACKAGE_NAME@d: $(foreach SRC, $(basename $(DAEMON_SRC)), $(OBJDBG)/$(SRC).o)
160   - @echo " CCLD `basename $@`"
161   - @$(MKDIR) `dirname $@`
162   - @$(CC) $(CFLAGS) -o $@ $^ $(GDBUS_LIBS) $(GLIB_LIBS) $(LIB3270_LIBS)
  180 +cleanRelease:
  181 +
  182 + @rm -fr $(BINRLS)/$(MODULE_NAME)@DLLEXT@ \
  183 + $(OBJRLS) \
  184 + dbus-glue.h
163 185  
164   -cleandebug-service: clean
  186 + @rm -fr $(POTDIR)
165 187  
166   -clean:
167   - @rm -fr $(OBJDIR)
168   - @rm -fr $(BINDIR)
169   - @rm -fr .tmp
170   - @rm -f dbus-glue.h
  188 +clean: \
  189 + cleanDebug \
  190 + cleanRelease
171 191  
  192 +
... ...
src/plugins/dbus3270/gobject.c
  Diff comments   View file @229adf2
... ... @@ -42,7 +42,7 @@
42 42 #include <lib3270/config.h>
43 43 #include <lib3270.h>
44 44 #include <pw3270.h>
45   -#include <v3270.h>
  45 +#include <pw3270/v3270.h>
46 46 #include <lib3270/actions.h>
47 47 #include <lib3270/charset.h>
48 48  
... ... @@ -81,7 +81,11 @@ PW3270Dbus * pw3270_dbus_new(void)
81 81 void pw3270_dbus_get_revision(PW3270Dbus *object, DBusGMethodInvocation *context)
82 82 {
83 83 trace("%s object=%p context=%p",__FUNCTION__,object,context);
  84 +#ifdef PACKAGE_REVISION
84 85 dbus_g_method_return(context,PACKAGE_REVISION);
  86 +#else
  87 + dbus_g_method_return(context,BUILD_DATE);
  88 +#endif
85 89 }
86 90  
87 91 void pw3270_dbus_connect(PW3270Dbus *object, const gchar *uri, DBusGMethodInvocation *context)
... ...
src/pw3270/Makefile.in
  Diff comments   View file @229adf2
... ... @@ -157,7 +157,7 @@ all: \
157 157 Release
158 158  
159 159 Release: \
160   - $(BINRLS)/$(PACKAGE_TARNAME)$(EXEEXT)
  160 + $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@
161 161  
162 162 pot: \
163 163 $(BASEDIR)/.pot/pw3270.pot
... ... @@ -170,7 +170,7 @@ $(BASEDIR)/.pot/pw3270.pot: \
170 170 @mkdir -p `dirname $@`
171 171 @$(MSGCAT) --sort-output $^ > $@
172 172  
173   -$(BINRLS)/$(PACKAGE_TARNAME)$(EXEEXT): \
  173 +$(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@: \
174 174 $(BINRLS)/$(LIBNAME) \
175 175 $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJRLS)/$(SRC).o)
176 176  
... ... @@ -199,7 +199,7 @@ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
199 199 @$(LD) -shared -Wl,-soname,$(@F) $(LDFLAGS) -L$(BINRLS) -o $@ $^ $(LIBS)
200 200  
201 201 install: \
202   - $(BINRLS)/$(PACKAGE_TARNAME)$(EXEEXT) \
  202 + $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \
203 203 $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/$(PACKAGE_NAME).png \
204 204 $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/$(PACKAGE_NAME)-logo.png
205 205  
... ... @@ -220,7 +220,7 @@ install: \
220 220 @$(MKDIR) $(DESTDIR)$(bindir)
221 221  
222 222 @$(INSTALL_PROGRAM) \
223   - $(BINRLS)/$(PACKAGE_TARNAME)$(EXEEXT) \
  223 + $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \
224 224 $(DESTDIR)$(bindir)
225 225  
226 226 $(SRCDIR): \
... ... @@ -238,9 +238,9 @@ $(SRCDIR): \
238 238 #---[ Debug Targets ]--------------------------------------------------------------------
239 239  
240 240 Debug: \
241   - $(BINDBG)/$(PACKAGE_TARNAME)$(EXEEXT)
  241 + $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@
242 242  
243   -$(BINDBG)/$(PACKAGE_TARNAME)$(EXEEXT): \
  243 +$(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@: \
244 244 $(BINDBG)/$(LIBNAME) \
245 245 $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC).o)
246 246  
... ...