Download as
Browse Code »

Commit 99f0850bf1254ca1d870d7acf5fa3e94525fb870

Authored by Perry Werneck
1 parent 31b54357
Exists in master and in 3 other branches develop, macos, network_module

Iniciando atualização dos Makefiles.

Showing 1 changed file with 68 additions and 154 deletions   Show diff stats
@@ -22,201 +22,115 @@ @@ -22,201 +22,115 @@
22 # 22 #
23 # perry.werneck@gmail.com (Alexandre Perry de Souza Werneck) 23 # perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
24 # erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça) 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
29 -PACKAGE=@PACKAGE_NAME@  
30 -PACKAGE_VERSION=@PACKAGE_VERSION@ 27 +LIBNAME=lib3270@DLLEXT@
  28 +
  29 +SOURCES = bounds.c ctlr.c util.c toggles.c screen.c selection.c kybd.c telnet.c \
  30 + iocalls.c connect.c \
  31 + host.c sf.c ansi.c resolver.c charset.c \
  32 + version.c session.c state.c html.c trace_ds.c see.c \
  33 + paste.c ssl.c actions.c \
  34 + ft.c ft_cut.c ft_dft.c glue.c resources.c \
  35 + rpq.c macros.c fallbacks.c log.c options.c
31 36
32 -DEBUG_CFLAGS=-DDEBUG=1 -g -Wall  
33 -DEPENDS ?= *.h ../include/*.h ../include/lib3270/*.h Makefile 37 +#---[ Configuration values ]-------------------------------------------------------------
34 38
35 -#---[ Paths ]------------------------------------------------------------------ 39 +PACKAGE_NAME=@PACKAGE_NAME@
  40 +PACKAGE_VERSION=@PACKAGE_VERSION@
  41 +PACKAGE_TARNAME=@PACKAGE_TARNAME@
36 42
37 prefix=@prefix@ 43 prefix=@prefix@
38 exec_prefix=@exec_prefix@ 44 exec_prefix=@exec_prefix@
  45 +bindir=@bindir@
  46 +sbindir=@sbindir@
39 libdir=@libdir@ 47 libdir=@libdir@
40 -includedir=@includedir@  
41 -localedir=@localedir@  
42 -datarootdir=@datarootdir@  
43 -sysconfdir=@sysconfdir@  
44 48
45 -#---[ Tools ]------------------------------------------------------------------ 49 +BASEDIR=@BASEDIR@
46 50
47 -CFLAGS=@CFLAGS@ @DLL_CFLAGS@ -DDATAROOTDIR=\"$(datarootdir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -I../include  
48 -SSL_CFLAGS=@LIBSSL_CFLAGS@ 51 +OBJDIR=$(BASEDIR)/.obj/lib3270
  52 +OBJDBG=$(OBJDIR)/Debug
  53 +OBJRLS=$(OBJDIR)/Release
49 54
50 -DLL_FLAGS=@DLL_FLAGS@  
51 -LDFLAGS=@LDFLAGS@ 55 +BINDIR=$(BASEDIR)/.bin
  56 +BINDBG=$(BINDIR)/Debug
  57 +BINRLS=$(BINDIR)/Release
52 58
53 -LIBS=@LIBS@ @LIBSSL_LIBS@ @INTL_LIBS@ @SOCKET_LIBS@ @LIBICONV@ 59 +INSTALL=@INSTALL@
  60 +INSTALL_DATA=@INSTALL_DATA@
  61 +INSTALL_PROGRAM=@INSTALL_PROGRAM@
54 62
55 -#---[ Tools ]------------------------------------------------------------------ 63 +LN_S=@LN_S@
56 64
  65 +AMTAR=@AMTAR@
  66 +SHELL=@SHELL@
57 MKDIR=@MKDIR_P@ 67 MKDIR=@MKDIR_P@
  68 +
58 CC=@CC@ 69 CC=@CC@
59 LD=@CC@ 70 LD=@CC@
60 -HOST_CC=@HOST_CC@  
61 -STRIP=@STRIP@  
62 -INSTALL=@INSTALL@  
63 -INSTALL_PROGRAM=$(INSTALL) -m 755  
64 -INSTALL_DATA=$(INSTALL) -m 644  
65 -VALGRIND=@VALGRIND@  
66 -XGETTEXT=@XGETTEXT@  
67 -MSGCAT=@MSGCAT@  
68 -LN_S=@LN_S@ -f  
69 -  
70 -#---[ ]------------------------------------------------------------------  
71 -  
72 -OBJEXT=.o  
73 71
74 -#---[ Paths ]------------------------------------------------------------------  
75 -  
76 -ROOTDIR ?= .  
77 -OBJDIR ?= $(ROOTDIR)/.obj  
78 -BINDIR ?= $(ROOTDIR)/.bin  
79 -TMPDIR ?= $(ROOTDIR)/.tmp  
80 -DEPENDS ?= *.h Makefile 72 +CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ @LIBSSL_CFLAGS@
  73 +LIBS=@LIBS@ @LIBSSL_LIBS@
  74 +LDFLAGS=@LDFLAGS@
81 75
82 -BINDBG ?= $(BINDIR)/Debug  
83 -BINRLS ?= $(BINDIR)/Release  
84 -LIBDBG ?= $(BINDIR)/Debug@DLLDIR@ 76 +#---[ Rules ]----------------------------------------------------------------------------
85 77
86 -OBJDBG = $(OBJDIR)/Debug  
87 -OBJRLS = $(OBJDIR)/Release  
88 -LIBRLS = $(OBJDIR)/Release@DLLDIR@ 78 +DEPENDS=$(BASEDIR)/src/include/*.h $(BASEDIR)/src/include/lib3270/*.h *.h Makefile
89 79
90 -#---[ Rules ]------------------------------------------------------------------ 80 +$(OBJDBG)/%.o: \
  81 + %.c \
  82 + $(DEPENDS)
91 83
92 -$(OBJDBG)/%.o: %.c $(DEPENDS)  
93 - @echo " CC `basename $@`" 84 + @echo $< ...
94 @$(MKDIR) `dirname $@` 85 @$(MKDIR) `dirname $@`
95 - @$(CC) $(DEBUG_CFLAGS) $(CFLAGS) $(SSL_CFLAGS) -o $@ -c $< 86 + @$(CC) $(CFLAGS) \
  87 + @DBG_CFLAGS@ \
  88 + -DBUILD_DATE=`date +"0x%Y%m%d"`\
  89 + -o $@ -c $<
96 90
97 -$(OBJRLS)/%.o: %.c $(DEPENDS)  
98 - @echo " CC `basename $@`"  
99 - @$(MKDIR) `dirname $@`  
100 - @$(CC) $(CFLAGS) $(SSL_CFLAGS) -o $@ -c $< 91 +$(OBJRLS)/%.o: \
  92 + %.cc \
  93 + $(DEPENDS)
101 94
102 -$(TMPDIR)/pot/%.pot: %.c  
103 - @echo " TEXT `basename $@`" 95 + @echo $< ...
104 @$(MKDIR) `dirname $@` 96 @$(MKDIR) `dirname $@`
105 - @$(XGETTEXT) --default-domain=$(PACKAGE) --language=C \  
106 - --keyword=_ --keyword=N_ --keyword=MSG_:2 --output=$@ $<  
107 - @touch $@ 97 + @$(CXX) $(CFLAGS) \
  98 + @RLS_CFLAGS@ \
  99 + -DBUILD_DATE=`date +"0x%Y%m%d"` \
  100 + -o $@ -c $<
108 101
109 102
110 -#---[ Sources ]---------------------------------------------------------------- 103 +#---[ Release Targets ]------------------------------------------------------------------
111 104
112 -include sources.mak  
113 -  
114 -#---[ Misc targets ]----------------------------------------------------------- 105 +all: \
  106 + $(BINRLS)/$(LIBNAME)
115 107
116 Release: \ 108 Release: \
117 - $(BINRLS)/lib3270@DLLEXT@  
118 -  
119 -install: \  
120 - Release 109 + $(BINRLS)/$(LIBNAME)
121 110
122 - $(MKDIR) $(DESTDIR)$(libdir)  
123 - $(INSTALL_PROGRAM) $(BINRLS)/lib3270@DLLEXT@.$(PACKAGE_VERSION) $(DESTDIR)$(libdir)  
124 - $(LN_S) lib3270@DLLEXT@.$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/lib3270@DLLEXT@.@MAJOR_VERSION@  
125 - $(LN_S) lib3270@DLLEXT@.@MAJOR_VERSION@ $(DESTDIR)$(libdir)/lib3270@DLLEXT@ 111 +#---[ Debug Targets ]--------------------------------------------------------------------
126 112
127 Debug: \ 113 Debug: \
128 - $(BINDBG)/lib3270@DLLEXT@ 114 + $(BINDBG)/$(LIBNAME)
129 115
130 -$(BINDBG)/lib3270@DLLEXT@: \  
131 - $(BINDBG)/lib3270@DLLEXT@.$(PACKAGE_VERSION) 116 +$(BINDBG)/$(LIBNAME): \
  117 + $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@
132 118
133 - @rm -f $@  
134 - @cd $(BINDBG) && $(LN_S) lib3270@DLLEXT@.$(PACKAGE_VERSION) lib3270@DLLEXT@  
135 -  
136 -$(BINDBG)/lib3270@DLLEXT@.$(PACKAGE_VERSION): \  
137 - $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@)  
138 -  
139 - @echo " CCLD `basename $@`" 119 + @echo $(basename $@) ...
140 @$(MKDIR) `dirname $@` 120 @$(MKDIR) `dirname $@`
141 - @$(LD) $(DLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @LDLIBFLAGS@ -o $@ $^ $(LIBS)  
142 -  
143 -$(BINRLS)/lib3270@DLLEXT@: \  
144 - $(BINRLS)/lib3270@DLLEXT@.$(PACKAGE_VERSION)  
145 -  
146 - @rm -f $@  
147 - @cd $(BINRLS) && $(LN_S) lib3270@DLLEXT@.$(PACKAGE_VERSION) lib3270@DLLEXT@ 121 + @$(LN_S) -f $(LIBNAME).@PACKAGE_MAJOR_VERSION@ $@
148 122
149 -$(BINRLS)/lib3270@DLLEXT@.$(PACKAGE_VERSION): \  
150 - $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC)@OBJEXT@) 123 +$(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@: \
  124 + $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
151 125
152 - @echo " CCLD `basename $@`" 126 + @echo $(basename $@) ...
153 @$(MKDIR) `dirname $@` 127 @$(MKDIR) `dirname $@`
154 - @$(LD) $(DLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @LDLIBFLAGS@ -o $@ $^ $(LIBS)  
155 - @$(STRIP) $@ 128 + @$(LN_S) -f $(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ $@
156 129
157 -$(BINDBG)/testprogram$(EXEEXT): \  
158 - $(OBJDBG)/testprogram.o $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@) 130 +$(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
  131 + $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o)
159 132
160 - @echo " CCLD `basename $@`" 133 + @echo $(basename $@) ...
161 @$(MKDIR) `dirname $@` 134 @$(MKDIR) `dirname $@`
162 - @$(LD) -o $@ $^ $(LIBS)  
163 -  
164 -$(BINDIR)/pot/lib3270.pot: \  
165 - $(foreach SRC, $(basename $(SOURCES)), $(TMPDIR)/pot/$(SRC).pot)  
166 -  
167 - @rm -f $@  
168 - @mkdir -p `dirname $@`  
169 - @$(MSGCAT) --sort-output $^ > $@  
170 -  
171 -test: \  
172 - $(BINDBG)/testprogram$(EXEEXT)  
173 -  
174 -run: \  
175 - $(BINDBG)/testprogram$(EXEEXT)  
176 -  
177 -ifeq ($(VALGRIND),no)  
178 - @PATH="$(BINDIR)/Debug@DLLDIR@:$(PATH)" "$(BINDBG)/testprogram$(EXEEXT)"  
179 -else  
180 - @PATH="$(BINDIR)/Debug@DLLDIR@:$(PATH)" G_DEBUG=gc-friendly G_SLICE=always-malloc \$(VALGRIND) --leak-check=full --suppressions=valgrind.suppression --gen-suppressions=all $(BINDBG)/testprogram$(EXEEXT)  
181 -endif  
182 -  
183 -memchk: \  
184 - $(BINDBG)/testprogram$(EXEEXT)  
185 -  
186 -ifeq ($(VALGRIND),no)  
187 - @cd "$(ROOTDIR)" ; .bin/Debug/testprogram$(EXEEXT)  
188 -else  
189 - @cd "$(ROOTDIR)" ; \$(VALGRIND) --leak-check=full --gen-suppressions=all $(BINDBG)/testprogram$(EXEEXT)  
190 -endif  
191 -  
192 -version.c: \  
193 - ./mkversion.sh  
194 -  
195 - @echo " GEN $@"  
196 - @chmod +x ./mkversion.sh  
197 - @./mkversion.sh  
198 -  
199 -fallbacks.c: \  
200 - X3270.xad mkfb.c  
201 -  
202 - @echo " GEN $@"  
203 - @$(MKDIR) $(BINDIR)  
204 - @$(HOST_CC) -g -o $(BINDIR)/mkfb@EXEEXT@ mkfb.c  
205 - @$(BINDIR)/mkfb@EXEEXT@ -c X3270.xad $@  
206 -  
207 -cleantest: \  
208 - clean  
209 -  
210 -cleanDebug: \  
211 - clean  
212 -  
213 -clean:  
214 - @rm -fr .obj  
215 - @rm -fr .bin  
216 - @rm -fr .tmp  
217 - @rm -f *.log  
218 - @rm -f version.c  
219 - @rm -f fallbacks.c  
220 - @rm -f lib3270.pot  
221 - @rm -fr debian 135 + @$(LD) -shared -Wl,-soname,$(LIBNAME) $(LDFLAGS) -o $@ $^ $(LIBS)
222 136