Download as
Browse Code »

Commit 3778ca7f045f932e8f90705d8dca0d4477088ed1

Authored by Perry Werneck
1 parent 69089377
Exists in master and in 1 other branch develop

Adding files required for windows sdk package.

Showing 3 changed files with 43 additions and 14 deletions   Show diff stats
@@ -93,6 +93,9 @@ install-static: @@ -93,6 +93,9 @@ install-static:
93 install-devel: 93 install-devel:
94 @$(MAKE) -C client DESTDIR=$(DESTDIR) install-devel 94 @$(MAKE) -C client DESTDIR=$(DESTDIR) install-devel
95 95
  96 +install-winlib:
  97 + @$(MAKE) -C client DESTDIR=$(DESTDIR) install-winlib
  98 +
96 doc: 99 doc:
97 @$(DOXYGEN) ./doxygen/doxyfile 100 @$(DOXYGEN) ./doxygen/doxyfile
98 101
client/Makefile.in
  Diff comments   View file @3778ca7
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
28 28
29 MODULE_NAME=ipc3270 29 MODULE_NAME=ipc3270
30 PACKAGE_NAME=@PACKAGE_NAME@ 30 PACKAGE_NAME=@PACKAGE_NAME@
  31 +PRODUCT_NAME=@PRODUCT_NAME@
31 32
32 MAIN_SOURCES= \ 33 MAIN_SOURCES= \
33 $(wildcard src/core/*.cc) \ 34 $(wildcard src/core/*.cc) \
@@ -62,6 +63,7 @@ MSGCAT=@MSGCAT@ @@ -62,6 +63,7 @@ MSGCAT=@MSGCAT@
62 WINDRES=@WINDRES@ 63 WINDRES=@WINDRES@
63 AR=@AR@ 64 AR=@AR@
64 VALGRIND=@VALGRIND@ 65 VALGRIND=@VALGRIND@
  66 +DLLTOOL=@DLLTOOL@
65 67
66 #---[ Paths ]---------------------------------------------------------------------------- 68 #---[ Paths ]----------------------------------------------------------------------------
67 69
@@ -107,11 +109,10 @@ CFLAGS= \ @@ -107,11 +109,10 @@ CFLAGS= \
107 @DBUS_CFLAGS@ 109 @DBUS_CFLAGS@
108 110
109 LDFLAGS=\ 111 LDFLAGS=\
110 - @STATIC_LDFLAGS@ \  
111 @LDFLAGS@ 112 @LDFLAGS@
112 113
113 LIBS= \ 114 LIBS= \
114 - @STATIC_LIBS@ \ 115 + @CLIENT_LIBS@ \
115 @LIBS@ \ 116 @LIBS@ \
116 @LIBICONV@ \ 117 @LIBICONV@ \
117 @INTL_LIBS@ \ 118 @INTL_LIBS@ \
@@ -204,7 +205,8 @@ $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@: \ @@ -204,7 +205,8 @@ $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@: \
204 @$(MKDIR) $(@D) 205 @$(MKDIR) $(@D)
205 @echo $< ... 206 @echo $< ...
206 @$(LD) \ 207 @$(LD) \
207 - -shared -Wl,-soname,$(@F) \ 208 + @CLIENT_LDFLAGS@ \
  209 + -Wl,-soname,$(@F) \
208 -o $@ \ 210 -o $@ \
209 $(LDFLAGS) \ 211 $(LDFLAGS) \
210 $^ \ 212 $^ \
@@ -281,6 +283,28 @@ install-devel: @@ -281,6 +283,28 @@ install-devel:
281 sdk/ipc3270.pc \ 283 sdk/ipc3270.pc \
282 $(DESTDIR)$(libdir)/pkgconfig/ipc3270.pc 284 $(DESTDIR)$(libdir)/pkgconfig/ipc3270.pc
283 285
  286 +install-winlib: \
  287 + $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@
  288 +
  289 + @$(MKDIR) \
  290 + $(DESTDIR)$(libdir)
  291 +
  292 + @$(INSTALL_DATA) \
  293 + $(BINRLS)/lib$(MODULE_NAME).dll.a \
  294 + $(DESTDIR)$(libdir)
  295 +
  296 + @$(DLLTOOL) \
  297 + --input-def $(BINRLS)/lib$(MODULE_NAME).def \
  298 + --dllname lib$(MODULE_NAME).dll \
  299 + --output-lib $(DESTDIR)$(libdir)/lib$(MODULE_NAME).lib
  300 +
  301 + @$(MKDIR) \
  302 + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def
  303 +
  304 + @$(INSTALL_DATA) \
  305 + $(BINRLS)/lib$(MODULE_NAME).def \
  306 + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def
  307 +
284 #---[ Misc Targets ]--------------------------------------------------------------------- 308 #---[ Misc Targets ]---------------------------------------------------------------------
285 309
286 $(POTDIR)/$(MODULE_NAME).pot: \ 310 $(POTDIR)/$(MODULE_NAME).pot: \
@@ -310,6 +334,7 @@ $(BINDBG)/$(MODULE_NAME)-client@EXEEXT@: \ @@ -310,6 +334,7 @@ $(BINDBG)/$(MODULE_NAME)-client@EXEEXT@: \
310 $^ \ 334 $^ \
311 -L$(BINDBG) \ 335 -L$(BINDBG) \
312 -Wl,-rpath,$(BINDBG) \ 336 -Wl,-rpath,$(BINDBG) \
  337 + @CLIENT_LDFLAGS@ \
313 $(LDFLAGS) \ 338 $(LDFLAGS) \
314 $(LIBS) 339 $(LIBS)
315 340
@@ -321,7 +346,8 @@ $(BINDBG)/lib$(MODULE_NAME)@LIBEXT@: \ @@ -321,7 +346,8 @@ $(BINDBG)/lib$(MODULE_NAME)@LIBEXT@: \
321 @$(MKDIR) $(@D) 346 @$(MKDIR) $(@D)
322 @echo $< ... 347 @echo $< ...
323 @$(LD) \ 348 @$(LD) \
324 - -shared -Wl,-soname,$(@F) \ 349 + @CLIENT_LDFLAGS@ \
  350 + -Wl,-soname,$(@F) \
325 -o $@ \ 351 -o $@ \
326 $(LDFLAGS) \ 352 $(LDFLAGS) \
327 $^ \ 353 $^ \
@@ -66,26 +66,25 @@ PLUGINS=&quot;&quot; @@ -66,26 +66,25 @@ PLUGINS=&quot;&quot;
66 APP_RESOURCES="" 66 APP_RESOURCES=""
67 APP_LDFLAGS="" 67 APP_LDFLAGS=""
68 DLL_LDFLAGS="-shared" 68 DLL_LDFLAGS="-shared"
69 -STATIC_LDFLAGS=""  
70 -STATIC_LIBS="" 69 +CLIENT_LDFLAGS=""
  70 +CLIENT_LIBS=""
71 CLIENT_TARGETS="shared devel" 71 CLIENT_TARGETS="shared devel"
72 72
73 dnl --------------------------------------------------------------------------- 73 dnl ---------------------------------------------------------------------------
74 dnl Check for OS specifics 74 dnl Check for OS specifics
75 dnl --------------------------------------------------------------------------- 75 dnl ---------------------------------------------------------------------------
76 76
77 -DLLPREFIX="lib"  
78 -  
79 case "$host" in 77 case "$host" in
80 *-mingw32|*-pc-msys) 78 *-mingw32|*-pc-msys)
81 app_cv_osname="windows" 79 app_cv_osname="windows"
82 CFLAGS="$CFLAGS -D_WIN32_WINNT=0x0600" 80 CFLAGS="$CFLAGS -D_WIN32_WINNT=0x0600"
83 LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32 -lkernel32" 81 LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32 -lkernel32"
84 LDFLAGS="$LDFLAGS" 82 LDFLAGS="$LDFLAGS"
85 - STATIC_LDFLAGS="-static-libgcc -static-libstdc++"  
86 - STATIC_LIBS="-Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive,-Bdynamic" 83 + CLIENT_LDFLAGS="-shared -static-libgcc -static-libstdc++ -Wl,--output-def,\$(@D)/\lib\$(MODULE_NAME).def,--out-implib,\$(@D)/\lib\$(MODULE_NAME).dll.a"
  84 + CLIENT_LIBS="-Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive,-Bdynamic"
87 DLLEXT=".dll" 85 DLLEXT=".dll"
88 - DLLPREFIX="" 86 + CLIENT_TARGETS="$CLIENT_TARGETS winlib"
  87 +
89 88
90 app_win32_revision=$(date +%-y.%-m.%-d.%-H) 89 app_win32_revision=$(date +%-y.%-m.%-d.%-H)
91 AC_SUBST(WIN32_VERSION,$app_win32_revision) 90 AC_SUBST(WIN32_VERSION,$app_win32_revision)
@@ -110,6 +109,7 @@ case &quot;$host&quot; in @@ -110,6 +109,7 @@ case &quot;$host&quot; in
110 app_cv_osname="linux" 109 app_cv_osname="linux"
111 LOGDIR="/var/log" 110 LOGDIR="/var/log"
112 DLLEXT=".so" 111 DLLEXT=".so"
  112 + CLIENT_LDFLAGS="-shared"
113 113
114 app_cv_static='no' 114 app_cv_static='no'
115 115
@@ -122,9 +122,8 @@ AC_SUBST(OSNAME,$app_cv_osname) @@ -122,9 +122,8 @@ AC_SUBST(OSNAME,$app_cv_osname)
122 AC_SUBST(LIBS) 122 AC_SUBST(LIBS)
123 AC_SUBST(LOGDIR) 123 AC_SUBST(LOGDIR)
124 AC_SUBST(DLLEXT) 124 AC_SUBST(DLLEXT)
125 -AC_SUBST(DLLPREFIX)  
126 -AC_SUBST(STATIC_LDFLAGS)  
127 -AC_SUBST(STATIC_LIBS) 125 +AC_SUBST(CLIENT_LDFLAGS)
  126 +AC_SUBST(CLIENT_LIBS)
128 127
129 AC_CHECK_FUNC(vasprintf, AC_DEFINE(HAVE_VASPRINTF) ) 128 AC_CHECK_FUNC(vasprintf, AC_DEFINE(HAVE_VASPRINTF) )
130 129
@@ -134,6 +133,7 @@ dnl --------------------------------------------------------------------------- @@ -134,6 +133,7 @@ dnl ---------------------------------------------------------------------------
134 133
135 AC_PATH_TOOL([AR], [ar], [ar]) 134 AC_PATH_TOOL([AR], [ar], [ar])
136 AC_PATH_TOOL([WINDRES], [windres], [no]) 135 AC_PATH_TOOL([WINDRES], [windres], [no])
  136 +AC_PATH_TOOL([DLLTOOL], [dlltool], [no])
137 137
138 PKG_CHECK_EXISTS 138 PKG_CHECK_EXISTS
139 139