Download as
Browse Code »

Commit f739da922977dbae51dcd0f5955082ccd6e91111

Authored by perry.werneck@gmail.com
1 parent 7d6d8411
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Implementando "make install"

Showing 6 changed files with 81 additions and 12 deletions   Show diff stats
@@ -49,12 +49,23 @@ BINDIR=.bin @@ -49,12 +49,23 @@ BINDIR=.bin
49 TMPDIR=.tmp 49 TMPDIR=.tmp
50 EXEEXT=@EXEEXT@ 50 EXEEXT=@EXEEXT@
51 DBGLIB=-L../../$(BINDIR)/Debug/lib -l3270 51 DBGLIB=-L../../$(BINDIR)/Debug/lib -l3270
  52 +RLSLIB=-L../../$(BINDIR)/Release/lib -l3270
52 53
53 #---[ Tools ]------------------------------------------------------------------ 54 #---[ Tools ]------------------------------------------------------------------
54 55
55 VALGRIND=@VALGRIND@ 56 VALGRIND=@VALGRIND@
56 MKDIR=@MKDIR_P@ 57 MKDIR=@MKDIR_P@
57 58
  59 +#---[ Release targets ]--------------------------------------------------------
  60 +
  61 +Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
  62 +
  63 +$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/gtk/* $(BINDIR)/Release/lib/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS)
  64 + @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/gtk ../../$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
  65 +
  66 +$(BINDIR)/Release/lib/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile
  67 + @$(MAKE) BINRLS=../../.bin/Release/lib -C src/lib3270 ../../.bin/Release/lib/@DLLPREFIX@3270@DLLEXT@
  68 +
58 #---[ Debug targets ]---------------------------------------------------------- 69 #---[ Debug targets ]----------------------------------------------------------
59 70
60 Debug: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) 71 Debug: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
@@ -84,6 +95,10 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz: clean @@ -84,6 +95,10 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz: clean
84 @tar --create --gzip --verbose --directory $(TMPDIR) --exclude-vcs --file=$@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 95 @tar --create --gzip --verbose --directory $(TMPDIR) --exclude-vcs --file=$@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
85 @echo $@ 96 @echo $@
86 97
  98 +install:
  99 + @make BINRLS="../../.bin/Release/lib" -C src/lib3270 install
  100 + @make BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/gtk install
  101 +
87 clean: 102 clean:
88 @rm -fr .obj 103 @rm -fr .obj
89 @rm -fr .bin 104 @rm -fr .bin
@@ -10,9 +10,8 @@ @@ -10,9 +10,8 @@
10 <Target title="Debug"> 10 <Target title="Debug">
11 <Option output=".bin/Debug/pw3270" prefix_auto="1" extension_auto="1" /> 11 <Option output=".bin/Debug/pw3270" prefix_auto="1" extension_auto="1" />
12 <Option object_output=".obj/Debug/" /> 12 <Option object_output=".obj/Debug/" />
13 - <Option type="1" /> 13 + <Option type="0" />
14 <Option compiler="gcc" /> 14 <Option compiler="gcc" />
15 - <Option use_console_runner="0" />  
16 <Compiler> 15 <Compiler>
17 <Add option="-g" /> 16 <Add option="-g" />
18 <Add option="-DDEBUG=1" /> 17 <Add option="-DDEBUG=1" />
src/gtk/Makefile.in
  Diff comments   View file @f739da9
@@ -33,15 +33,14 @@ PACKAGE_NAME=@PACKAGE_NAME@ @@ -33,15 +33,14 @@ PACKAGE_NAME=@PACKAGE_NAME@
33 prefix=@prefix@ 33 prefix=@prefix@
34 exec_prefix=@exec_prefix@ 34 exec_prefix=@exec_prefix@
35 bindir=@bindir@ 35 bindir=@bindir@
36 -sbindir=@sbindir@  
37 -libdir=@libdir@  
38 -includedir=@includedir@  
39 datarootdir=@datarootdir@ 36 datarootdir=@datarootdir@
40 localedir=@localedir@ 37 localedir=@localedir@
41 -docdir=@docdir@  
42 -sysconfdir=@sysconfdir@  
43 38
44 EXEEXT=@EXEEXT@ 39 EXEEXT=@EXEEXT@
  40 +STRIP=@STRIP@
  41 +INSTALL=@INSTALL@
  42 +INSTALL_PROGRAM=@INSTALL_PROGRAM@
  43 +INSTALL_DATA=@INSTALL_DATA@
45 44
46 #---[ Sources ]---------------------------------------------------------------- 45 #---[ Sources ]----------------------------------------------------------------
47 46
@@ -65,6 +64,21 @@ LIBS=@LIBS@ @GTK_LIBS@ @@ -65,6 +64,21 @@ LIBS=@LIBS@ @GTK_LIBS@
65 64
66 include ../include/rules.mak 65 include ../include/rules.mak
67 66
  67 +#---[ Release targets ]--------------------------------------------------------
  68 +
  69 +Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
  70 + @$(STRIP) $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
  71 +
  72 +install: Release
  73 + @$(MKDIR) $(DESTDIR)$(bindir)
  74 + @$(INSTALL_PROGRAM) $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) $(DESTDIR)$(bindir)
  75 +
  76 +$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): $(foreach SRC, $(basename $(SOURCES)), $(OBJDIR)/Release/$(SRC)$(OBJEXT))
  77 +
  78 + @echo $@ ...
  79 + @$(MKDIR) `dirname $@`
  80 + @$(LD) -Wl,--rpath,.bin/Debug/lib -o $@ $^ $(LIBS) $(LIB3270_LIBS)
  81 +
68 #---[ Debug targets ]---------------------------------------------------------- 82 #---[ Debug targets ]----------------------------------------------------------
69 83
70 Debug: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) 84 Debug: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
src/gtk/v3270/oia.c
  Diff comments   View file @f739da9
@@ -175,7 +175,7 @@ static void setup_luname_position(GdkRectangle *rect, struct v3270_metrics *metr @@ -175,7 +175,7 @@ static void setup_luname_position(GdkRectangle *rect, struct v3270_metrics *metr
175 #ifdef DEBUG 175 #ifdef DEBUG
176 cairo_set_source_rgb(cr,0.1,0.1,0.1); 176 cairo_set_source_rgb(cr,0.1,0.1,0.1);
177 #else 177 #else
178 - gdk_cairo_set_source_color(cr,terminal->color+V3270_COLOR_OIA_BACKGROUND); 178 + gdk_cairo_set_source_color(cr,color+V3270_COLOR_OIA_BACKGROUND);
179 #endif 179 #endif
180 180
181 cairo_rectangle(cr, rect->x, rect->y, rect->width, rect->height); 181 cairo_rectangle(cr, rect->x, rect->y, rect->width, rect->height);
@@ -305,7 +305,7 @@ void v3270_draw_ssl_status(cairo_t *cr, H3270 *host, struct v3270_metrics *metri @@ -305,7 +305,7 @@ void v3270_draw_ssl_status(cairo_t *cr, H3270 *host, struct v3270_metrics *metri
305 #ifdef DEBUG 305 #ifdef DEBUG
306 cairo_set_source_rgb(cr,0.1,0.1,0.1); 306 cairo_set_source_rgb(cr,0.1,0.1,0.1);
307 #else 307 #else
308 - gdk_cairo_set_source_color(cr,terminal->color+V3270_COLOR_OIA_BACKGROUND); 308 + gdk_cairo_set_source_color(cr,color+V3270_COLOR_OIA_BACKGROUND);
309 #endif 309 #endif
310 310
311 cairo_translate(cr, rect->x, rect->y); 311 cairo_translate(cr, rect->x, rect->y);
src/include/rules.mak.in
  Diff comments   View file @f739da9
@@ -56,13 +56,24 @@ ROOTDIR ?= . @@ -56,13 +56,24 @@ ROOTDIR ?= .
56 OBJDIR ?= $(ROOTDIR)/.obj 56 OBJDIR ?= $(ROOTDIR)/.obj
57 BINDIR ?= $(ROOTDIR)/.bin 57 BINDIR ?= $(ROOTDIR)/.bin
58 58
  59 +BINDBG ?= $(BINDIR)/Debug
  60 +BINRLS ?= $(BINDIR)/Release
  61 +
  62 +OBJDBG = $(OBJDIR)/Debug
  63 +OBJRLS = $(OBJDIR)/Release
  64 +
59 #---[ Rules ]------------------------------------------------------------------ 65 #---[ Rules ]------------------------------------------------------------------
60 66
61 -$(OBJDIR)/Debug/%.o: %.c $(DEPENDS) 67 +$(OBJDBG)/%.o: %.c $(DEPENDS)
62 @echo `basename $@` ... 68 @echo `basename $@` ...
63 @$(MKDIR) `dirname $@` 69 @$(MKDIR) `dirname $@`
64 @$(CC) $(DEBUG_CFLAGS) $(CFLAGS) $(LIB3270_CFLAGS) -o $@ -c $< 70 @$(CC) $(DEBUG_CFLAGS) $(CFLAGS) $(LIB3270_CFLAGS) -o $@ -c $<
65 71
  72 +$(OBJRLS)/%.o: %.c $(DEPENDS)
  73 + @echo `basename $@` ...
  74 + @$(MKDIR) `dirname $@`
  75 + @$(CC) $(CFLAGS) $(LIB3270_CFLAGS) -o $@ -c $<
  76 +
66 #---[ Targets ]---------------------------------------------------------------- 77 #---[ Targets ]----------------------------------------------------------------
67 78
68 clean-common: 79 clean-common:
src/lib3270/Makefile.in
  Diff comments   View file @f739da9
@@ -39,12 +39,24 @@ LIBS=@LIBS@ @LIBSSL_LIBS@ @SOCKET_LIBS@ @@ -39,12 +39,24 @@ LIBS=@LIBS@ @LIBSSL_LIBS@ @SOCKET_LIBS@
39 DEBUG_CFLAGS=-DDEBUG=1 -g 39 DEBUG_CFLAGS=-DDEBUG=1 -g
40 DEPENDS ?= *.h ../../src/include/*.h Makefile 40 DEPENDS ?= *.h ../../src/include/*.h Makefile
41 41
  42 +#---[ Paths ]------------------------------------------------------------------
  43 +
  44 +prefix=@prefix@
  45 +exec_prefix=@exec_prefix@
  46 +libdir=@libdir@
  47 +includedir=@includedir@
  48 +localedir=@localedir@
  49 +
42 #---[ Tools ]------------------------------------------------------------------ 50 #---[ Tools ]------------------------------------------------------------------
43 51
44 MKDIR=@MKDIR_P@ 52 MKDIR=@MKDIR_P@
45 CC=@CC@ 53 CC=@CC@
46 LD=@CC@ 54 LD=@CC@
47 HOST_CC=@HOST_CC@ 55 HOST_CC=@HOST_CC@
  56 +STRIP=@STRIP@
  57 +INSTALL=@INSTALL@
  58 +INSTALL_PROGRAM=@INSTALL_PROGRAM@
  59 +INSTALL_DATA=@INSTALL_DATA@
48 60
49 #---[ ]------------------------------------------------------------------ 61 #---[ ]------------------------------------------------------------------
50 62
@@ -56,17 +68,24 @@ ROOTDIR ?= . @@ -56,17 +68,24 @@ ROOTDIR ?= .
56 OBJDIR ?= $(ROOTDIR)/.obj 68 OBJDIR ?= $(ROOTDIR)/.obj
57 BINDIR ?= $(ROOTDIR)/.bin 69 BINDIR ?= $(ROOTDIR)/.bin
58 DEPENDS ?= *.h Makefile 70 DEPENDS ?= *.h Makefile
  71 +
59 BINDBG ?= $(BINDIR)/Debug 72 BINDBG ?= $(BINDIR)/Debug
  73 +BINRLS ?= $(BINDIR)/Release
60 74
61 OBJDBG = $(OBJDIR)/Debug 75 OBJDBG = $(OBJDIR)/Debug
  76 +OBJRLS = $(OBJDIR)/Release
62 77
63 #---[ Rules ]------------------------------------------------------------------ 78 #---[ Rules ]------------------------------------------------------------------
64 79
65 -$(OBJDIR)/Debug/%.o: %.c $(DEPENDS) 80 +$(OBJDBG)/%.o: %.c $(DEPENDS)
66 @echo $< ... 81 @echo $< ...
67 @$(MKDIR) `dirname $@` 82 @$(MKDIR) `dirname $@`
68 @$(CC) $(DEBUG_CFLAGS) $(CFLAGS) $(SSL_CFLAGS) -o $@ -c $< 83 @$(CC) $(DEBUG_CFLAGS) $(CFLAGS) $(SSL_CFLAGS) -o $@ -c $<
69 84
  85 +$(OBJRLS)/%.o: %.c $(DEPENDS)
  86 + @echo $< ...
  87 + @$(MKDIR) `dirname $@`
  88 + @$(CC) $(CFLAGS) $(SSL_CFLAGS) -o $@ -c $<
70 89
71 #---[ Sources ]---------------------------------------------------------------- 90 #---[ Sources ]----------------------------------------------------------------
72 91
@@ -79,14 +98,25 @@ SOURCES = XtGlue.c actions.c ansi.c charset.c ctlr.c \ @@ -79,14 +98,25 @@ SOURCES = XtGlue.c actions.c ansi.c charset.c ctlr.c \
79 98
80 #---[ Misc targets ]----------------------------------------------------------- 99 #---[ Misc targets ]-----------------------------------------------------------
81 100
82 -Debug: $(BINDBG)/@DLLPREFIX@3270@DLLEXT@ 101 +Release: $(BINRLS)/@DLLPREFIX@3270@DLLEXT@
83 102
  103 +install: Release
  104 + @$(MKDIR) $(DESTDIR)$(libdir)
  105 + @$(INSTALL_PROGRAM) $(BINRLS)/@DLLPREFIX@3270@DLLEXT@ $(DESTDIR)$(libdir)
  106 +
  107 +Debug: $(BINDBG)/@DLLPREFIX@3270@DLLEXT@
84 108
85 $(BINDBG)/@DLLPREFIX@3270@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@) 109 $(BINDBG)/@DLLPREFIX@3270@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@)
86 @echo $@ ... 110 @echo $@ ...
87 @$(MKDIR) `dirname $@` 111 @$(MKDIR) `dirname $@`
88 @$(LD) $(DLL_FLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) 112 @$(LD) $(DLL_FLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
89 113
  114 +$(BINRLS)/@DLLPREFIX@3270@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC)@OBJEXT@)
  115 + @echo $@ ...
  116 + @$(MKDIR) `dirname $@`
  117 + @$(LD) $(DLL_FLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
  118 + @$(STRIP) $@
  119 +
90 version.c: ./mkversion.sh 120 version.c: ./mkversion.sh
91 @echo $@ ... 121 @echo $@ ...
92 @chmod +x ./mkversion.sh 122 @chmod +x ./mkversion.sh