Commit f609302fe07b6bf23a544d940b3cd5e027635d0e
1 parent
fb920683
Exists in
master
and in
5 other branches
Revertendo commit errado.
Showing
1 changed file
with
49 additions
and
152 deletions
Show diff stats
Makefile.in
... | ... | @@ -24,192 +24,91 @@ |
24 | 24 | # erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça) |
25 | 25 | # |
26 | 26 | |
27 | -#---[ Library configuration ]------------------------------------------------------------ | |
27 | +#---[ Configuration values ]--------------------------------------------------- | |
28 | 28 | |
29 | -LIBNAME=@LIB3270_NAME@ | |
29 | +PACKAGE_NAME=@PACKAGE_NAME@ | |
30 | +PACKAGE_VERSION=@PACKAGE_VERSION@ | |
31 | +PACKAGE_LEVEL=@PACKAGE_LEVEL@ | |
32 | +PACKAGE_TARNAME=@PACKAGE_TARNAME@ | |
33 | +PACKAGE_DESCRIPTION=@PACKAGE_DESCRIPTION@ | |
34 | +PLUGINS=@PLUGINS@ | |
30 | 35 | |
31 | -SOURCES= \ | |
32 | - $(wildcard src/lib3270/*.c) \ | |
33 | - $(wildcard src/lib3270/@OSNAME@/*.c) \ | |
34 | - $(wildcard src/lib3270/@OSNAME@/*.rc) \ | |
35 | - $(BASEDIR)/.tmp/@DLLPREFIX@$(LIBNAME)/fallbacks.c | |
36 | - | |
37 | -#---[ Tools ]---------------------------------------------------------------------------- | |
38 | - | |
39 | -CC=@CC@ | |
40 | -HOST_CC=@HOST_CC@ | |
41 | -LD=@CC@ | |
42 | -LN_S=@LN_S@ | |
43 | -MKDIR=@MKDIR_P@ | |
44 | -INSTALL=@INSTALL@ | |
45 | -INSTALL_DATA=@INSTALL_DATA@ | |
46 | -INSTALL_PROGRAM=@INSTALL_PROGRAM@ | |
47 | - | |
48 | -#---[ Paths ]---------------------------------------------------------------------------- | |
36 | +#---[ Paths ]------------------------------------------------------------------ | |
49 | 37 | |
50 | 38 | prefix=@prefix@ |
51 | 39 | exec_prefix=@exec_prefix@ |
52 | 40 | bindir=@bindir@ |
53 | 41 | sbindir=@sbindir@ |
54 | 42 | libdir=@libdir@ |
55 | -includedir=@includedir@ | |
56 | 43 | datarootdir=@datarootdir@ |
57 | -localedir=@localedir@ | |
44 | +localedir=${datarootdir}/locale | |
58 | 45 | docdir=@docdir@ |
59 | 46 | sysconfdir=@sysconfdir@ |
47 | +mandir=@mandir@ | |
60 | 48 | |
61 | 49 | BASEDIR=@BASEDIR@ |
62 | 50 | |
63 | -OBJDIR=$(BASEDIR)/.obj/@DLLPREFIX@$(LIBNAME) | |
64 | -OBJDBG=$(OBJDIR)/Debug | |
65 | -OBJRLS=$(OBJDIR)/Release | |
66 | - | |
67 | -BINDIR=$(BASEDIR)/.bin/@DLLPREFIX@$(LIBNAME) | |
51 | +POTDIR=$(BASEDIR)/.pot | |
52 | +BINDIR=$(BASEDIR)/.bin | |
68 | 53 | BINDBG=$(BINDIR)/Debug |
69 | 54 | BINRLS=$(BINDIR)/Release |
70 | 55 | |
71 | -#---[ Rules ]---------------------------------------------------------------------------- | |
72 | - | |
73 | -DEPENDS= \ | |
74 | - Makefile \ | |
75 | - src/include/*.h \ | |
76 | - src/include/lib3270/*.h \ | |
77 | - src/lib3270/*.h | |
78 | - | |
56 | +#---[ Tools ]------------------------------------------------------------------ | |
79 | 57 | |
80 | -CFLAGS= \ | |
81 | - @CFLAGS@ \ | |
82 | - -g \ | |
83 | - -Isrc/include | |
84 | - -DBUILD_DATE=`date +%Y%m%d` \ | |
85 | - @LIBSSL_CFLAGS@ | |
86 | - | |
87 | -LIBS= \ | |
88 | - @LIBS@ \ | |
89 | - @LIBSSL_LIBS@ | |
90 | - | |
91 | -#---[ Debug Rules ]---------------------------------------------------------------------- | |
92 | - | |
93 | -$(OBJDBG)/%.o: \ | |
94 | - %.c \ | |
95 | - $(DEPENDS) | |
96 | - | |
97 | - @echo $< ... | |
98 | - @$(MKDIR) `dirname $@` | |
99 | - @$(CC) \ | |
100 | - $(CFLAGS) \ | |
101 | - -Wall -Wextra -fstack-check \ | |
102 | - -DDEBUG=1 \ | |
103 | - -DDATADIR=$(BASEDIR) \ | |
104 | - -o $@ -c $< | |
105 | - | |
106 | -#---[ Release Rules ]-------------------------------------------------------------------- | |
107 | - | |
108 | -$(OBJRLS)/%.o: \ | |
109 | - %.c \ | |
110 | - $(DEPENDS) | |
111 | - | |
112 | - @echo $< ... | |
113 | - @$(MKDIR) `dirname $@` | |
114 | - @$(CC) \ | |
115 | - $(CFLAGS) \ | |
116 | - -DNDEBUG=1 \ | |
117 | - -DDATADIR=$(datarootdir)/pw3270 \ | |
118 | - -o $@ -c $< | |
58 | +CC=@CC@ | |
59 | +LD=@CC@ | |
60 | +LN_S=@LN_S@ | |
61 | +MKDIR=@MKDIR_P@ | |
62 | +INSTALL=@INSTALL@ | |
63 | +INSTALL_DATA=@INSTALL_DATA@ | |
64 | +INSTALL_PROGRAM=@INSTALL_PROGRAM@ | |
119 | 65 | |
120 | 66 | #---[ Release Targets ]------------------------------------------------------------------ |
121 | 67 | |
122 | 68 | all: \ |
123 | - $(BINRLS)/@DLLPREFIX@$(LIBNAME)@DLLEXT@ | |
69 | + $(BINRLS)/@DLLPREFIX@3270@DLLEXT@ \ | |
70 | + $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ | |
124 | 71 | |
125 | 72 | Release: \ |
126 | - $(BINRLS)/@DLLPREFIX@$(LIBNAME)@DLLEXT@ | |
127 | - | |
128 | -$(BINRLS)/@DLLPREFIX@$(LIBNAME)@DLLEXT@: \ | |
129 | - $(BINRLS)/@DLLPREFIX@$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ | |
130 | - | |
131 | - @echo $< ... | |
132 | - @rm -f $@ | |
133 | - @$(LN_S) \ | |
134 | - @DLLPREFIX@$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \ | |
135 | - $@ | |
73 | + $(BINRLS)/@DLLPREFIX@3270@DLLEXT@ \ | |
74 | + $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ | |
136 | 75 | |
137 | -$(BINRLS)/@DLLPREFIX@$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \ | |
138 | - $(BINRLS)/@DLLPREFIX@$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ | |
139 | 76 | |
140 | - @rm -f $@ | |
141 | - @$(LN_S) \ | |
142 | - @DLLPREFIX@$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \ | |
143 | - $@ | |
144 | - | |
145 | -$(BINRLS)/@DLLPREFIX@$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ | |
146 | - $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) | |
77 | +$(BINRLS)/@DLLPREFIX@3270@DLLEXT@: \ | |
78 | + submodules/lib3270/* \ | |
79 | + submodules/lib3270/src/lib3270/* \ | |
80 | + submodules/lib3270/src/include/* | |
147 | 81 | |
148 | 82 | @$(MKDIR) `dirname $@` |
149 | - @echo $< ... | |
150 | - @$(LD) \ | |
151 | - -shared -Wl,-soname,$(@F) \ | |
152 | - -o $@ \ | |
153 | - $(LDFLAGS) \ | |
154 | - $(LIBS) | |
155 | - | |
156 | -#---[ Misc Targets ]--------------------------------------------------------------------- | |
83 | + $(MAKE) -C submodules/lib3270 Release | |
157 | 84 | |
158 | -src/lib3270/version.c: \ | |
159 | - Makefile | |
85 | + @cp ./submodules/lib3270/.bin/lib3270/Debug/* $(BINRLS) | |
160 | 86 | |
161 | - @echo $(basename $@) ... | |
162 | - @chmod +x src/lib3270/mkversion.sh | |
163 | - @./src/lib3270/mkversion.sh | |
87 | +#---[ Debug Rules ]---------------------------------------------------------------------- | |
164 | 88 | |
165 | -$(BASEDIR)/.tmp/@DLLPREFIX@$(LIBNAME)/fallbacks.c: \ | |
166 | - X3270.xad \ | |
167 | - $(wildcard src/mkfb/*.c) | |
89 | +$(BINDBG)/@DLLPREFIX@3270@DLLEXT@: \ | |
90 | + submodules/lib3270/* \ | |
91 | + submodules/lib3270/src/lib3270/* \ | |
92 | + submodules/lib3270/src/include/* | |
168 | 93 | |
169 | 94 | @$(MKDIR) `dirname $@` |
170 | - @echo $< ... | |
171 | - $(HOST_CC) -g -o $(BINDIR)/mkfb@EXEEXT@ $(wildcard src/mkfb/*.c) | |
172 | - $(BINDIR)/mkfb@EXEEXT@ -c X3270.xad $@ | |
95 | + @$(MAKE) -C submodules/lib3270 Debug | |
173 | 96 | |
174 | -#---[ Install Targets ]------------------------------------------------------------------ | |
97 | + @cp ./submodules/lib3270/.bin/lib3270/Debug/* $(BINDBG) | |
175 | 98 | |
99 | +$(BINDBG)/%@EXEEXT@: \ | |
100 | + $(BINDBG)/@DLLPREFIX@3270@DLLEXT@ \ | |
101 | + src/% \ | |
102 | + src/%/* | |
176 | 103 | |
177 | -#---[ Debug Targets ]-------------------------------------------------------------------- | |
178 | - | |
179 | -x: \ | |
180 | - $(BASEDIR)/.tmp/@DLLPREFIX@$(LIBNAME)/fallbacks.c | |
104 | + @make -C src/$(notdir $(basename $@)) $@ | |
181 | 105 | |
182 | -Debug: \ | |
183 | - $(BINDBG)/@DLLPREFIX@$(LIBNAME)@DLLEXT@ | |
184 | 106 | |
185 | -$(BINDBG)/@DLLPREFIX@$(LIBNAME)@DLLEXT@: \ | |
186 | - $(BINDBG)/@DLLPREFIX@$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ | |
187 | - | |
188 | - @echo $< ... | |
189 | - @rm -f $@ | |
190 | - @$(LN_S) \ | |
191 | - @DLLPREFIX@$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \ | |
192 | - $@ | |
193 | - | |
194 | -$(BINDBG)/@DLLPREFIX@$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \ | |
195 | - $(BINDBG)/@DLLPREFIX@$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ | |
196 | - | |
197 | - @rm -f $@ | |
198 | - @$(LN_S) \ | |
199 | - @DLLPREFIX@$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \ | |
200 | - $@ | |
201 | - | |
202 | -$(BINDBG)/@DLLPREFIX@$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ | |
203 | - $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) | |
107 | +#---[ Debug Targets ]-------------------------------------------------------------------- | |
204 | 108 | |
205 | - @$(MKDIR) `dirname $@` | |
206 | - @echo $< ... | |
207 | - @$(LD) \ | |
208 | - -shared -Wl,-soname,$(@F) \ | |
209 | - -o $@ \ | |
210 | - $(LDFLAGS) \ | |
211 | - $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) \ | |
212 | - $(LIBS) | |
109 | +Debug: \ | |
110 | + $(BINDBG)/@DLLPREFIX@3270@DLLEXT@ \ | |
111 | + $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ | |
213 | 112 | |
214 | 113 | #---[ Clean Targets ]-------------------------------------------------------------------- |
215 | 114 | |
... | ... | @@ -217,20 +116,18 @@ clean: \ |
217 | 116 | cleanDebug \ |
218 | 117 | cleanRelease |
219 | 118 | |
220 | - @rm -fr $(BASEDIR)/.tmp/@DLLPREFIX@$(LIBNAME) | |
221 | - | |
222 | 119 | cleanDebug: |
223 | 120 | |
224 | 121 | @rm -fr $(OBJDBG) |
225 | 122 | @rm -fr $(BINDBG) |
123 | + @$(MAKE) -C submodules/lib3270 $@ | |
226 | 124 | |
227 | 125 | cleanRelease: |
228 | 126 | |
229 | 127 | @rm -fr $(OBJRLS) |
230 | 128 | @rm -fr $(BINRLS) |
129 | + @$(MAKE) -C submodules/lib3270 $@ | |
130 | + | |
231 | 131 | |
232 | -clean: \ | |
233 | - cleanDebug \ | |
234 | - cleanRelease | |
235 | 132 | |
236 | 133 | ... | ... |