Download as
Browse Code »

Commit 1a733b16b7177beaf32e1483a09f3f54e00c18b1

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

Refactoring build process.

Showing 3 changed files with 39 additions and 46 deletions   Show diff stats
@@ -65,20 +65,26 @@ MSGCAT=@MSGCAT@ @@ -65,20 +65,26 @@ MSGCAT=@MSGCAT@
65 #---[ Release Targets ]------------------------------------------------------------------ 65 #---[ Release Targets ]------------------------------------------------------------------
66 66
67 all: \ 67 all: \
68 - $(BINRLS)/ipcserver@DLLEXT@ \  
69 - $(BINRLS)/libipc3270@LIBEXT@ \ 68 + server \
  69 + client \
70 locale/$(GETTEXT_PACKAGE).pot 70 locale/$(GETTEXT_PACKAGE).pot
71 71
72 -plugin: \ 72 +server: \
73 $(BINRLS)/ipcserver@DLLEXT@ 73 $(BINRLS)/ipcserver@DLLEXT@
74 74
75 -library: \ 75 +client: \
76 $(BINRLS)/libipc3270@LIBEXT@ 76 $(BINRLS)/libipc3270@LIBEXT@
77 77
78 -$(BINRLS)/ipcserver@DLLEXT@: 78 +$(BINRLS)/ipcserver@DLLEXT@: \
  79 + server/* \
  80 + Makefile
  81 +
79 @$(MAKE) -C server $@ 82 @$(MAKE) -C server $@
80 83
81 -$(BINRLS)/libipc3270@LIBEXT@: 84 +$(BINRLS)/libipc3270@LIBEXT@: \
  85 + client/* \
  86 + Makefile
  87 +
82 @$(MAKE) -C client $@ 88 @$(MAKE) -C client $@
83 89
84 locale/$(GETTEXT_PACKAGE).pot: 90 locale/$(GETTEXT_PACKAGE).pot:
@@ -97,38 +103,23 @@ locale/$(GETTEXT_PACKAGE).pot: @@ -97,38 +103,23 @@ locale/$(GETTEXT_PACKAGE).pot:
97 #---[ Install Targets ]------------------------------------------------------------------ 103 #---[ Install Targets ]------------------------------------------------------------------
98 104
99 install: \ 105 install: \
100 - install-plugin \  
101 - install-locale \  
102 - $(foreach CLIENT_TARGET, $(CLIENT_TARGETS), install-$(CLIENT_TARGET)) 106 + install-server \
  107 + install-client \
  108 + install-locale
103 109
104 install-locale: \ 110 install-locale: \
105 locale/$(LIBNAME).pot 111 locale/$(LIBNAME).pot
106 @$(MAKE) -C locale DESTDIR=$(DESTDIR) install 112 @$(MAKE) -C locale DESTDIR=$(DESTDIR) install
107 113
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 114 +install-server: \
  115 + server
116 116
117 -install-devel: \  
118 - locale/$(LIBNAME).pot  
119 -  
120 - @$(MAKE) -C client DESTDIR=$(DESTDIR) install-devel  
121 -  
122 - # Install translation files  
123 - @$(MKDIR) \  
124 - $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot 117 + @$(MAKE) -C server DESTDIR=$(DESTDIR) install
125 118
126 - @$(INSTALL_DATA) \  
127 - locale/$(LIBNAME).pot \  
128 - $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot 119 +install-client: \
  120 + client
129 121
130 -install-windows-lib:  
131 - @$(MAKE) -C client DESTDIR=$(DESTDIR) install-windows-lib 122 + @$(MAKE) -C client DESTDIR=$(DESTDIR) install
132 123
133 doc: 124 doc:
134 @$(DOXYGEN) ./doxygen/doxyfile 125 @$(DOXYGEN) ./doxygen/doxyfile
client/Makefile.in
  Diff comments   View file @1a733b1
@@ -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=library static
51 50
52 #---[ Tools ]---------------------------------------------------------------------------- 51 #---[ Tools ]----------------------------------------------------------------------------
53 52
@@ -201,12 +200,15 @@ $(POTDIR)/$(MODULE_NAME)/%.pot: \ @@ -201,12 +200,15 @@ $(POTDIR)/$(MODULE_NAME)/%.pot: \
201 #---[ Release Targets ]------------------------------------------------------------------ 200 #---[ Release Targets ]------------------------------------------------------------------
202 201
203 all: \ 202 all: \
204 - $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@ \  
205 - $(BINRLS)/lib$(MODULE_NAME).static.a \  
206 - $(POTDIR)/$(MODULE_NAME).pot 203 + $(foreach MODULE, $(CLIENT_MODULES), $(MODULE))
207 204
208 Release: \ 205 Release: \
209 - $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@ \ 206 + $(foreach MODULE, $(CLIENT_MODULES), $(MODULE))
  207 +
  208 +library: \
  209 + $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@
  210 +
  211 +static: \
210 $(BINRLS)/lib$(MODULE_NAME).static.a 212 $(BINRLS)/lib$(MODULE_NAME).static.a
211 213
212 $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@: \ 214 $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@: \
@@ -235,9 +237,13 @@ $(BINRLS)/lib$(MODULE_NAME).static.a: \ @@ -235,9 +237,13 @@ $(BINRLS)/lib$(MODULE_NAME).static.a: \
235 #---[ Install Targets ]------------------------------------------------------------------ 237 #---[ Install Targets ]------------------------------------------------------------------
236 238
237 install: \ 239 install: \
238 - $(foreach TARGET, $(TARGETS), install-$(TARGET)) 240 + $(foreach MODULE, $(CLIENT_MODULES), install-$(MODULE)) \
  241 + install-devel
  242 +
  243 +install-library: \
  244 + install-@OSNAME@-library
239 245
240 -install-linux-lib: \ 246 +install-linux-library: \
241 $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@ 247 $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@
242 248
243 @$(MKDIR) \ 249 @$(MKDIR) \
@@ -251,7 +257,7 @@ install-linux-lib: \ @@ -251,7 +257,7 @@ install-linux-lib: \
251 lib$(MODULE_NAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \ 257 lib$(MODULE_NAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \
252 $(DESTDIR)$(libdir)/lib$(MODULE_NAME)@DLLEXT@ 258 $(DESTDIR)$(libdir)/lib$(MODULE_NAME)@DLLEXT@
253 259
254 -install-windows-lib: \ 260 +install-windows-library: \
255 $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@ 261 $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@
256 262
257 @$(MKDIR) \ 263 @$(MKDIR) \
@@ -62,7 +62,7 @@ dnl --------------------------------------------------------------------------- @@ -62,7 +62,7 @@ dnl ---------------------------------------------------------------------------
62 62
63 CLIENT_LDFLAGS="" 63 CLIENT_LDFLAGS=""
64 CLIENT_LIBS="" 64 CLIENT_LIBS=""
65 -CLIENT_TARGETS="devel" 65 +CLIENT_MODULES="library"
66 66
67 dnl --------------------------------------------------------------------------- 67 dnl ---------------------------------------------------------------------------
68 dnl Check for OS specifics 68 dnl Check for OS specifics
@@ -78,8 +78,6 @@ case "$host" in @@ -78,8 +78,6 @@ case "$host" in
78 CLIENT_LIBS="-Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive,-Bdynamic" 78 CLIENT_LIBS="-Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive,-Bdynamic"
79 DLLEXT=".dll" 79 DLLEXT=".dll"
80 80
81 - CLIENT_TARGETS="windows-lib $CLIENT_TARGETS"  
82 -  
83 app_win32_revision=$(date +%-y.%-m.%-d.%-H) 81 app_win32_revision=$(date +%-y.%-m.%-d.%-H)
84 AC_SUBST(WIN32_VERSION,$app_win32_revision) 82 AC_SUBST(WIN32_VERSION,$app_win32_revision)
85 83
@@ -105,8 +103,6 @@ case "$host" in @@ -105,8 +103,6 @@ case "$host" in
105 DLLEXT=".so" 103 DLLEXT=".so"
106 CLIENT_LDFLAGS="-shared" 104 CLIENT_LDFLAGS="-shared"
107 105
108 - CLIENT_TARGETS="linux-lib $CLIENT_TARGETS"  
109 -  
110 app_cv_static='no' 106 app_cv_static='no'
111 107
112 esac 108 esac
@@ -188,10 +184,10 @@ AC_ARG_ENABLE([static], @@ -188,10 +184,10 @@ AC_ARG_ENABLE([static],
188 ]) 184 ])
189 185
190 if test "$app_cv_static" == "yes"; then 186 if test "$app_cv_static" == "yes"; then
191 - CLIENT_TARGETS="$CLIENT_TARGETS static" 187 + CLIENT_MODULES="$CLIENT_MODULES static"
192 fi 188 fi
193 189
194 -AC_SUBST(CLIENT_TARGETS) 190 +AC_SUBST(CLIENT_MODULES)
195 191
196 dnl --------------------------------------------------------------------------- 192 dnl ---------------------------------------------------------------------------
197 dnl Check for libintl 193 dnl Check for libintl