Commit 7559ff44956eadbf5e7ca55e02eb04d2f16d8290
Exists in
master
and in
1 other branch
Merge branch 'develop'
Showing
5 changed files
with
109 additions
and
51 deletions
Show diff stats
Makefile.in
@@ -27,9 +27,7 @@ | @@ -27,9 +27,7 @@ | ||
27 | PACKAGE_NAME=@PACKAGE_NAME@ | 27 | PACKAGE_NAME=@PACKAGE_NAME@ |
28 | PRODUCT_NAME=@PRODUCT_NAME@ | 28 | PRODUCT_NAME=@PRODUCT_NAME@ |
29 | LIBNAME=libipc3270 | 29 | LIBNAME=libipc3270 |
30 | - | ||
31 | -CLIENT_TARGETS= \ | ||
32 | - @CLIENT_TARGETS@ | 30 | +PROJECT_MODULES=@PROJECT_MODULES@ |
33 | 31 | ||
34 | #---[ Paths ]---------------------------------------------------------------------------- | 32 | #---[ Paths ]---------------------------------------------------------------------------- |
35 | 33 | ||
@@ -65,20 +63,25 @@ MSGCAT=@MSGCAT@ | @@ -65,20 +63,25 @@ MSGCAT=@MSGCAT@ | ||
65 | #---[ Release Targets ]------------------------------------------------------------------ | 63 | #---[ Release Targets ]------------------------------------------------------------------ |
66 | 64 | ||
67 | all: \ | 65 | all: \ |
68 | - $(BINRLS)/ipcserver@DLLEXT@ \ | ||
69 | - $(BINRLS)/libipc3270@LIBEXT@ \ | 66 | + $(foreach MODULE, $(PROJECT_MODULES), $(MODULE)) \ |
70 | locale/$(GETTEXT_PACKAGE).pot | 67 | locale/$(GETTEXT_PACKAGE).pot |
71 | 68 | ||
72 | -plugin: \ | 69 | +server: \ |
73 | $(BINRLS)/ipcserver@DLLEXT@ | 70 | $(BINRLS)/ipcserver@DLLEXT@ |
74 | 71 | ||
75 | -library: \ | 72 | +client: \ |
76 | $(BINRLS)/libipc3270@LIBEXT@ | 73 | $(BINRLS)/libipc3270@LIBEXT@ |
77 | 74 | ||
78 | -$(BINRLS)/ipcserver@DLLEXT@: | 75 | +$(BINRLS)/ipcserver@DLLEXT@: \ |
76 | + server/* \ | ||
77 | + Makefile | ||
78 | + | ||
79 | @$(MAKE) -C server $@ | 79 | @$(MAKE) -C server $@ |
80 | 80 | ||
81 | -$(BINRLS)/libipc3270@LIBEXT@: | 81 | +$(BINRLS)/libipc3270@LIBEXT@: \ |
82 | + client/* \ | ||
83 | + Makefile | ||
84 | + | ||
82 | @$(MAKE) -C client $@ | 85 | @$(MAKE) -C client $@ |
83 | 86 | ||
84 | locale/$(GETTEXT_PACKAGE).pot: | 87 | locale/$(GETTEXT_PACKAGE).pot: |
@@ -97,38 +100,30 @@ locale/$(GETTEXT_PACKAGE).pot: | @@ -97,38 +100,30 @@ locale/$(GETTEXT_PACKAGE).pot: | ||
97 | #---[ Install Targets ]------------------------------------------------------------------ | 100 | #---[ Install Targets ]------------------------------------------------------------------ |
98 | 101 | ||
99 | install: \ | 102 | install: \ |
100 | - install-plugin \ | ||
101 | - install-locale \ | ||
102 | - $(foreach CLIENT_TARGET, $(CLIENT_TARGETS), install-$(CLIENT_TARGET)) | 103 | + $(foreach MODULE, $(PROJECT_MODULES), install-$(MODULE)) \ |
104 | + install-locale | ||
103 | 105 | ||
104 | install-locale: \ | 106 | install-locale: \ |
105 | locale/$(LIBNAME).pot | 107 | locale/$(LIBNAME).pot |
108 | + | ||
106 | @$(MAKE) -C locale DESTDIR=$(DESTDIR) install | 109 | @$(MAKE) -C locale DESTDIR=$(DESTDIR) install |
107 | 110 | ||
108 | -install-plugin: | ||
109 | - @$(MAKE) -C server DESTDIR=$(DESTDIR) install | ||
110 | - | ||
111 | -install-linux-lib: | ||
112 | - @$(MAKE) -C client DESTDIR=$(DESTDIR) install-linux-lib | ||
113 | - | ||
114 | -install-static: | ||
115 | - @$(MAKE) -C client DESTDIR=$(DESTDIR) install-static | ||
116 | - | ||
117 | -install-devel: \ | ||
118 | - locale/$(LIBNAME).pot | ||
119 | - | ||
120 | - @$(MAKE) -C client DESTDIR=$(DESTDIR) install-devel | ||
121 | - | ||
122 | - # Install translation files | ||
123 | @$(MKDIR) \ | 111 | @$(MKDIR) \ |
124 | $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot | 112 | $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot |
125 | 113 | ||
126 | @$(INSTALL_DATA) \ | 114 | @$(INSTALL_DATA) \ |
127 | locale/$(LIBNAME).pot \ | 115 | locale/$(LIBNAME).pot \ |
128 | - $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot | 116 | + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot/$(LIBNAME).pot |
117 | + | ||
118 | +install-server: \ | ||
119 | + server | ||
120 | + | ||
121 | + @$(MAKE) -C server DESTDIR=$(DESTDIR) install | ||
122 | + | ||
123 | +install-client: \ | ||
124 | + client | ||
129 | 125 | ||
130 | -install-windows-lib: | ||
131 | - @$(MAKE) -C client DESTDIR=$(DESTDIR) install-windows-lib | 126 | + @$(MAKE) -C client DESTDIR=$(DESTDIR) install |
132 | 127 | ||
133 | doc: | 128 | doc: |
134 | @$(DOXYGEN) ./doxygen/doxyfile | 129 | @$(DOXYGEN) ./doxygen/doxyfile |
client/Makefile.in
@@ -46,8 +46,7 @@ DYNAMIC_SOURCES= \ | @@ -46,8 +46,7 @@ DYNAMIC_SOURCES= \ | ||
46 | TEST_SOURCES= \ | 46 | TEST_SOURCES= \ |
47 | $(wildcard src/testprogram/*.cc) | 47 | $(wildcard src/testprogram/*.cc) |
48 | 48 | ||
49 | -TARGETS= \ | ||
50 | - @CLIENT_TARGETS@ | 49 | +CLIENT_MODULES=@CLIENT_MODULES@ |
51 | 50 | ||
52 | #---[ Tools ]---------------------------------------------------------------------------- | 51 | #---[ Tools ]---------------------------------------------------------------------------- |
53 | 52 | ||
@@ -64,6 +63,7 @@ WINDRES=@WINDRES@ | @@ -64,6 +63,7 @@ WINDRES=@WINDRES@ | ||
64 | AR=@AR@ | 63 | AR=@AR@ |
65 | VALGRIND=@VALGRIND@ | 64 | VALGRIND=@VALGRIND@ |
66 | DLLTOOL=@DLLTOOL@ | 65 | DLLTOOL=@DLLTOOL@ |
66 | +STRIP=@STRIP@ | ||
67 | 67 | ||
68 | #---[ Paths ]---------------------------------------------------------------------------- | 68 | #---[ Paths ]---------------------------------------------------------------------------- |
69 | 69 | ||
@@ -128,6 +128,11 @@ $(OBJDBG)/%.o: \ | @@ -128,6 +128,11 @@ $(OBJDBG)/%.o: \ | ||
128 | @echo $< ... | 128 | @echo $< ... |
129 | @$(MKDIR) $(@D) | 129 | @$(MKDIR) $(@D) |
130 | 130 | ||
131 | + @$(CC) \ | ||
132 | + $(CFLAGS) \ | ||
133 | + -DDEBUG=1 \ | ||
134 | + -MM -MT $@ -MF $(patsubst %.o,%.d,$@) $< | ||
135 | + | ||
131 | @$(CXX) \ | 136 | @$(CXX) \ |
132 | $(CFLAGS) \ | 137 | $(CFLAGS) \ |
133 | -Wall -Wextra -fstack-check \ | 138 | -Wall -Wextra -fstack-check \ |
@@ -150,6 +155,12 @@ $(OBJRLS)/%.o: \ | @@ -150,6 +155,12 @@ $(OBJRLS)/%.o: \ | ||
150 | 155 | ||
151 | @echo $< ... | 156 | @echo $< ... |
152 | @$(MKDIR) $(@D) | 157 | @$(MKDIR) $(@D) |
158 | + | ||
159 | + @$(CC) \ | ||
160 | + $(CFLAGS) \ | ||
161 | + -DNDEBUG=1 \ | ||
162 | + -MM -MT $@ -MF $(patsubst %.o,%.d,$@) $< | ||
163 | + | ||
153 | @$(CXX) \ | 164 | @$(CXX) \ |
154 | $(CFLAGS) \ | 165 | $(CFLAGS) \ |
155 | -DNDEBUG=1 \ | 166 | -DNDEBUG=1 \ |
@@ -189,12 +200,15 @@ $(POTDIR)/$(MODULE_NAME)/%.pot: \ | @@ -189,12 +200,15 @@ $(POTDIR)/$(MODULE_NAME)/%.pot: \ | ||
189 | #---[ Release Targets ]------------------------------------------------------------------ | 200 | #---[ Release Targets ]------------------------------------------------------------------ |
190 | 201 | ||
191 | all: \ | 202 | all: \ |
192 | - $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@ \ | ||
193 | - $(BINRLS)/lib$(MODULE_NAME).a \ | ||
194 | - $(POTDIR)/$(MODULE_NAME).pot | 203 | + $(foreach MODULE, $(CLIENT_MODULES), $(MODULE)) |
195 | 204 | ||
196 | Release: \ | 205 | Release: \ |
197 | - $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@ \ | 206 | + $(foreach MODULE, $(CLIENT_MODULES), $(MODULE)) |
207 | + | ||
208 | +library: \ | ||
209 | + $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@ | ||
210 | + | ||
211 | +static: \ | ||
198 | $(BINRLS)/lib$(MODULE_NAME).static.a | 212 | $(BINRLS)/lib$(MODULE_NAME).static.a |
199 | 213 | ||
200 | $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@: \ | 214 | $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@: \ |
@@ -223,9 +237,13 @@ $(BINRLS)/lib$(MODULE_NAME).static.a: \ | @@ -223,9 +237,13 @@ $(BINRLS)/lib$(MODULE_NAME).static.a: \ | ||
223 | #---[ Install Targets ]------------------------------------------------------------------ | 237 | #---[ Install Targets ]------------------------------------------------------------------ |
224 | 238 | ||
225 | install: \ | 239 | install: \ |
226 | - $(foreach TARGET, $(TARGETS), install-$(TARGET)) | 240 | + $(foreach MODULE, $(CLIENT_MODULES), install-$(MODULE)) \ |
241 | + install-devel | ||
242 | + | ||
243 | +install-library: \ | ||
244 | + install-@OSNAME@-library | ||
227 | 245 | ||
228 | -install-linux-lib: \ | 246 | +install-linux-library: \ |
229 | $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@ | 247 | $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@ |
230 | 248 | ||
231 | @$(MKDIR) \ | 249 | @$(MKDIR) \ |
@@ -239,7 +257,7 @@ install-linux-lib: \ | @@ -239,7 +257,7 @@ install-linux-lib: \ | ||
239 | lib$(MODULE_NAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \ | 257 | lib$(MODULE_NAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \ |
240 | $(DESTDIR)$(libdir)/lib$(MODULE_NAME)@DLLEXT@ | 258 | $(DESTDIR)$(libdir)/lib$(MODULE_NAME)@DLLEXT@ |
241 | 259 | ||
242 | -install-windows-lib: \ | 260 | +install-windows-library: \ |
243 | $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@ | 261 | $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@ |
244 | 262 | ||
245 | @$(MKDIR) \ | 263 | @$(MKDIR) \ |
@@ -248,6 +266,10 @@ install-windows-lib: \ | @@ -248,6 +266,10 @@ install-windows-lib: \ | ||
248 | @$(INSTALL_PROGRAM) \ | 266 | @$(INSTALL_PROGRAM) \ |
249 | $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@ \ | 267 | $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@ \ |
250 | $(DESTDIR)$(bindir)/lib$(MODULE_NAME)@LIBEXT@ | 268 | $(DESTDIR)$(bindir)/lib$(MODULE_NAME)@LIBEXT@ |
269 | + | ||
270 | + @$(STRIP) \ | ||
271 | + --discard-all \ | ||
272 | + $(DESTDIR)$(bindir)/lib$(MODULE_NAME)@LIBEXT@ | ||
251 | 273 | ||
252 | @$(MKDIR) \ | 274 | @$(MKDIR) \ |
253 | $(DESTDIR)$(libdir) | 275 | $(DESTDIR)$(libdir) |
@@ -392,4 +414,9 @@ clean: \ | @@ -392,4 +414,9 @@ clean: \ | ||
392 | cleanDebug \ | 414 | cleanDebug \ |
393 | cleanRelease | 415 | cleanRelease |
394 | 416 | ||
417 | +-include $(foreach SRC, $(basename $(MAIN_SOURCES)), $(OBJDBG)/$(SRC).d) | ||
418 | +-include $(foreach SRC, $(basename $(DYNAMIC_SOURCES)), $(OBJDBG)/$(SRC).d) | ||
419 | + | ||
420 | +-include $(foreach SRC, $(basename $(MAIN_SOURCES)), $(OBJRLS)/$(SRC).d) | ||
421 | +-include $(foreach SRC, $(basename $(DYNAMIC_SOURCES)), $(OBJRLS)/$(SRC).d) | ||
395 | 422 |
configure.ac
@@ -62,7 +62,8 @@ dnl --------------------------------------------------------------------------- | @@ -62,7 +62,8 @@ dnl --------------------------------------------------------------------------- | ||
62 | 62 | ||
63 | CLIENT_LDFLAGS="" | 63 | CLIENT_LDFLAGS="" |
64 | CLIENT_LIBS="" | 64 | CLIENT_LIBS="" |
65 | -CLIENT_TARGETS="devel" | 65 | +CLIENT_MODULES="library" |
66 | +PROJECT_MODULES="client" | ||
66 | 67 | ||
67 | dnl --------------------------------------------------------------------------- | 68 | dnl --------------------------------------------------------------------------- |
68 | dnl Check for OS specifics | 69 | dnl Check for OS specifics |
@@ -78,8 +79,6 @@ case "$host" in | @@ -78,8 +79,6 @@ case "$host" in | ||
78 | CLIENT_LIBS="-Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive,-Bdynamic" | 79 | CLIENT_LIBS="-Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive,-Bdynamic" |
79 | DLLEXT=".dll" | 80 | DLLEXT=".dll" |
80 | 81 | ||
81 | - CLIENT_TARGETS="windows-lib $CLIENT_TARGETS" | ||
82 | - | ||
83 | app_win32_revision=$(date +%-y.%-m.%-d.%-H) | 82 | app_win32_revision=$(date +%-y.%-m.%-d.%-H) |
84 | AC_SUBST(WIN32_VERSION,$app_win32_revision) | 83 | AC_SUBST(WIN32_VERSION,$app_win32_revision) |
85 | 84 | ||
@@ -105,8 +104,6 @@ case "$host" in | @@ -105,8 +104,6 @@ case "$host" in | ||
105 | DLLEXT=".so" | 104 | DLLEXT=".so" |
106 | CLIENT_LDFLAGS="-shared" | 105 | CLIENT_LDFLAGS="-shared" |
107 | 106 | ||
108 | - CLIENT_TARGETS="linux-lib $CLIENT_TARGETS" | ||
109 | - | ||
110 | app_cv_static='no' | 107 | app_cv_static='no' |
111 | 108 | ||
112 | esac | 109 | esac |
@@ -129,6 +126,7 @@ dnl --------------------------------------------------------------------------- | @@ -129,6 +126,7 @@ dnl --------------------------------------------------------------------------- | ||
129 | AC_PATH_TOOL([AR], [ar], [ar]) | 126 | AC_PATH_TOOL([AR], [ar], [ar]) |
130 | AC_PATH_TOOL([WINDRES], [windres], [no]) | 127 | AC_PATH_TOOL([WINDRES], [windres], [no]) |
131 | AC_PATH_TOOL([DLLTOOL], [dlltool], [no]) | 128 | AC_PATH_TOOL([DLLTOOL], [dlltool], [no]) |
129 | +AC_PATH_TOOL([STRIP], [strip], [true]) | ||
132 | 130 | ||
133 | PKG_CHECK_EXISTS | 131 | PKG_CHECK_EXISTS |
134 | 132 | ||
@@ -187,11 +185,9 @@ AC_ARG_ENABLE([static], | @@ -187,11 +185,9 @@ AC_ARG_ENABLE([static], | ||
187 | ]) | 185 | ]) |
188 | 186 | ||
189 | if test "$app_cv_static" == "yes"; then | 187 | if test "$app_cv_static" == "yes"; then |
190 | - CLIENT_TARGETS="$CLIENT_TARGETS static" | 188 | + CLIENT_MODULES="$CLIENT_MODULES static" |
191 | fi | 189 | fi |
192 | 190 | ||
193 | -AC_SUBST(CLIENT_TARGETS) | ||
194 | - | ||
195 | dnl --------------------------------------------------------------------------- | 191 | dnl --------------------------------------------------------------------------- |
196 | dnl Check for libintl | 192 | dnl Check for libintl |
197 | dnl --------------------------------------------------------------------------- | 193 | dnl --------------------------------------------------------------------------- |
@@ -268,11 +264,16 @@ dnl --------------------------------------------------------------------------- | @@ -268,11 +264,16 @@ dnl --------------------------------------------------------------------------- | ||
268 | dnl Check for LIBV3270 | 264 | dnl Check for LIBV3270 |
269 | dnl --------------------------------------------------------------------------- | 265 | dnl --------------------------------------------------------------------------- |
270 | 266 | ||
271 | -PKG_CHECK_MODULES( [V3270], [libv3270], AC_DEFINE(HAVE_V3270), AC_MSG_ERROR([V3270 not present.])) | 267 | +PKG_CHECK_MODULES( [V3270], [libv3270], app_cv_libv3270=yes, AC_MSG_NOTICE([V3270 not present.])) |
272 | 268 | ||
273 | AC_SUBST(V3270_LIBS) | 269 | AC_SUBST(V3270_LIBS) |
274 | AC_SUBST(V3270_CFLAGS) | 270 | AC_SUBST(V3270_CFLAGS) |
275 | 271 | ||
272 | +if test "$app_cv_libv3270" == "yes"; then | ||
273 | + AC_DEFINE(HAVE_V3270) | ||
274 | + PROJECT_MODULES="$PROJECT_MODULES server" | ||
275 | +fi | ||
276 | + | ||
276 | dnl --------------------------------------------------------------------------- | 277 | dnl --------------------------------------------------------------------------- |
277 | dnl Check for GTK | 278 | dnl Check for GTK |
278 | dnl --------------------------------------------------------------------------- | 279 | dnl --------------------------------------------------------------------------- |
@@ -453,9 +454,13 @@ dnl --------------------------------------------------------------------------- | @@ -453,9 +454,13 @@ dnl --------------------------------------------------------------------------- | ||
453 | dnl Output the generated config.status script. | 454 | dnl Output the generated config.status script. |
454 | dnl --------------------------------------------------------------------------- | 455 | dnl --------------------------------------------------------------------------- |
455 | AC_SUBST(BASEDIR,$ac_pwd) | 456 | AC_SUBST(BASEDIR,$ac_pwd) |
457 | + | ||
456 | CFLAGS="$CFLAGS -DHAVE_CONFIG_H" | 458 | CFLAGS="$CFLAGS -DHAVE_CONFIG_H" |
457 | CXXFLAGS="$CXXFLAGS -DHAVE_CONFIG_H" | 459 | CXXFLAGS="$CXXFLAGS -DHAVE_CONFIG_H" |
458 | 460 | ||
461 | +AC_SUBST(CLIENT_MODULES) | ||
462 | +AC_SUBST(PROJECT_MODULES) | ||
463 | + | ||
459 | AC_OUTPUT | 464 | AC_OUTPUT |
460 | 465 | ||
461 | 466 |
server/Makefile.in
@@ -62,6 +62,7 @@ MSGCAT=@MSGCAT@ | @@ -62,6 +62,7 @@ MSGCAT=@MSGCAT@ | ||
62 | WINDRES=@WINDRES@ | 62 | WINDRES=@WINDRES@ |
63 | AR=@AR@ | 63 | AR=@AR@ |
64 | VALGRIND=@VALGRIND@ | 64 | VALGRIND=@VALGRIND@ |
65 | +STRIP=@STRIP@ | ||
65 | 66 | ||
66 | #---[ Paths ]---------------------------------------------------------------------------- | 67 | #---[ Paths ]---------------------------------------------------------------------------- |
67 | 68 | ||
@@ -130,6 +131,11 @@ $(OBJDBG)/%.o: \ | @@ -130,6 +131,11 @@ $(OBJDBG)/%.o: \ | ||
130 | 131 | ||
131 | @$(CC) \ | 132 | @$(CC) \ |
132 | $(CFLAGS) \ | 133 | $(CFLAGS) \ |
134 | + -DDEBUG=1 \ | ||
135 | + -MM -MT $@ -MF $(patsubst %.o,%.d,$@) $< | ||
136 | + | ||
137 | + @$(CC) \ | ||
138 | + $(CFLAGS) \ | ||
133 | -Wall -Wextra -fstack-check \ | 139 | -Wall -Wextra -fstack-check \ |
134 | -DDEBUG=1 \ | 140 | -DDEBUG=1 \ |
135 | -DPLUGIN_PATH=$(BINDBG) \ | 141 | -DPLUGIN_PATH=$(BINDBG) \ |
@@ -150,6 +156,12 @@ $(OBJRLS)/%.o: \ | @@ -150,6 +156,12 @@ $(OBJRLS)/%.o: \ | ||
150 | 156 | ||
151 | @echo $< ... | 157 | @echo $< ... |
152 | @$(MKDIR) $(@D) | 158 | @$(MKDIR) $(@D) |
159 | + | ||
160 | + @$(CC) \ | ||
161 | + $(CFLAGS) \ | ||
162 | + -DNDEBUG=1 \ | ||
163 | + -MM -MT $@ -MF $(patsubst %.o,%.d,$@) $< | ||
164 | + | ||
153 | @$(CC) \ | 165 | @$(CC) \ |
154 | $(CFLAGS) \ | 166 | $(CFLAGS) \ |
155 | -DNDEBUG=1 \ | 167 | -DNDEBUG=1 \ |
@@ -221,9 +233,9 @@ $(BINRLS)/lib$(MODULE_NAME).a: \ | @@ -221,9 +233,9 @@ $(BINRLS)/lib$(MODULE_NAME).a: \ | ||
221 | #---[ Install Targets ]------------------------------------------------------------------ | 233 | #---[ Install Targets ]------------------------------------------------------------------ |
222 | 234 | ||
223 | install: \ | 235 | install: \ |
224 | - install-plugin | 236 | + install-plugin-@OSNAME@ |
225 | 237 | ||
226 | -install-plugin: \ | 238 | +install-plugin-linux: \ |
227 | $(BINRLS)/$(MODULE_NAME)@DLLEXT@ | 239 | $(BINRLS)/$(MODULE_NAME)@DLLEXT@ |
228 | 240 | ||
229 | @$(MKDIR) $(DESTDIR)$(libdir)/$(PRODUCT_NAME)-plugins | 241 | @$(MKDIR) $(DESTDIR)$(libdir)/$(PRODUCT_NAME)-plugins |
@@ -232,6 +244,19 @@ install-plugin: \ | @@ -232,6 +244,19 @@ install-plugin: \ | ||
232 | $(BINRLS)/$(MODULE_NAME)@DLLEXT@ \ | 244 | $(BINRLS)/$(MODULE_NAME)@DLLEXT@ \ |
233 | $(DESTDIR)$(libdir)/$(PRODUCT_NAME)-plugins | 245 | $(DESTDIR)$(libdir)/$(PRODUCT_NAME)-plugins |
234 | 246 | ||
247 | +install-plugin-windows: \ | ||
248 | + $(BINRLS)/$(MODULE_NAME)@DLLEXT@ | ||
249 | + | ||
250 | + @$(MKDIR) $(DESTDIR)$(libdir)/$(PRODUCT_NAME)-plugins | ||
251 | + | ||
252 | + @$(INSTALL_PROGRAM) \ | ||
253 | + $(BINRLS)/$(MODULE_NAME)@DLLEXT@ \ | ||
254 | + $(DESTDIR)$(libdir)/$(PRODUCT_NAME)-plugins/$(MODULE_NAME)@DLLEXT@ | ||
255 | + | ||
256 | + @$(STRIP) \ | ||
257 | + --discard-all \ | ||
258 | + $(DESTDIR)$(libdir)/$(PRODUCT_NAME)-plugins/$(MODULE_NAME)@DLLEXT@ | ||
259 | + | ||
235 | #---[ Misc Targets ]--------------------------------------------------------------------- | 260 | #---[ Misc Targets ]--------------------------------------------------------------------- |
236 | 261 | ||
237 | $(POTDIR)/$(MODULE_NAME).pot: \ | 262 | $(POTDIR)/$(MODULE_NAME).pot: \ |
@@ -381,4 +406,10 @@ clean: \ | @@ -381,4 +406,10 @@ clean: \ | ||
381 | cleanDebug \ | 406 | cleanDebug \ |
382 | cleanRelease | 407 | cleanRelease |
383 | 408 | ||
409 | +-include $(foreach SRC, $(basename $(PLUGIN_SOURCES)), $(OBJDBG)/$(SRC).d) | ||
410 | +-include $(foreach SRC, $(basename $(PLUGIN_SOURCES)), $(OBJRLS)/$(SRC).d) | ||
411 | + | ||
412 | +-include $(foreach SRC, $(basename $(SERVICE_SOURCES)), $(OBJDBG)/$(SRC).d) | ||
413 | +-include $(foreach SRC, $(basename $(SERVICE_SOURCES)), $(OBJRLS)/$(SRC).d) | ||
414 | + | ||
384 | 415 |
server/src/plugin/windows/resources.rc.in
@@ -14,7 +14,7 @@ BEGIN | @@ -14,7 +14,7 @@ BEGIN | ||
14 | VALUE "CompanyName", "Banco do Brasil S/A.\0" | 14 | VALUE "CompanyName", "Banco do Brasil S/A.\0" |
15 | VALUE "FileVersion", "@WIN32_VERSION@\0" | 15 | VALUE "FileVersion", "@WIN32_VERSION@\0" |
16 | VALUE "LegalCopyright", "(C) 2017 Banco do Brasil S/A. All Rights Reserved\0" | 16 | VALUE "LegalCopyright", "(C) 2017 Banco do Brasil S/A. All Rights Reserved\0" |
17 | - VALUE "OriginalFilename", "ipc3270@DLLEXT@@DLLEXT@\0"" | 17 | + VALUE "OriginalFilename", "ipcserver@DLLEXT@@DLLEXT@\0"" |
18 | VALUE "ProductName", "@PRODUCT_NAME@\0" | 18 | VALUE "ProductName", "@PRODUCT_NAME@\0" |
19 | VALUE "ProductVersion", "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@\0" | 19 | VALUE "ProductVersion", "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@\0" |
20 | END | 20 | END |