Download as
Browse Code »

Commit 773a48515667509756e01095f5538efa4fdaebca

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

Ajustes para poder compilar o pacote com outro nome

Showing 5 changed files with 27 additions and 25 deletions   Show diff stats
src/include/plugin.mak.in
  Diff comments   View file @773a485
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
25 # 25 #
26 26
27 PACKAGE_NAME=@PACKAGE_NAME@ 27 PACKAGE_NAME=@PACKAGE_NAME@
  28 +PACKAGE_TARNAME=@PACKAGE_TARNAME@
28 29
29 #---[ Sources ]---------------------------------------------------------------- 30 #---[ Sources ]----------------------------------------------------------------
30 31
@@ -75,7 +76,7 @@ DLL_NAME=@DLLDIR@/@DLLPREFIX@$(MODULE_NAME)@DLLEXT@ @@ -75,7 +76,7 @@ DLL_NAME=@DLLDIR@/@DLLPREFIX@$(MODULE_NAME)@DLLEXT@
75 PLUGIN_NAME=plugins/$(MODULE_NAME)@DLLEXT@ 76 PLUGIN_NAME=plugins/$(MODULE_NAME)@DLLEXT@
76 77
77 ifeq ($(LIB3270_MODE),Debug) 78 ifeq ($(LIB3270_MODE),Debug)
78 - PW3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -lpw3270 79 + PW3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l$(PACKAGE_TARNAME)
79 PW3270_CFLAGS=-I../../../src/include 80 PW3270_CFLAGS=-I../../../src/include
80 LIB3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l3270 81 LIB3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l3270
81 LIB270_CFLAGS=-I../../../src/include 82 LIB270_CFLAGS=-I../../../src/include
@@ -83,7 +84,7 @@ endif @@ -83,7 +84,7 @@ endif
83 84
84 ifeq ($(LIB3270_MODE),Release) 85 ifeq ($(LIB3270_MODE),Release)
85 BINRLS=../../../.bin/Release 86 BINRLS=../../../.bin/Release
86 - PW3270_LIBS=-L$(BINRLS)@DLLDIR@ -lpw3270 87 + PW3270_LIBS=-L$(BINRLS)@DLLDIR@ -l$(PACKAGE_TARNAME)
87 PW3270_CFLAGS=-I../../../src/include 88 PW3270_CFLAGS=-I../../../src/include
88 LIB3270_LIBS=-L$(BINRLS)@DLLDIR@ -l3270 89 LIB3270_LIBS=-L$(BINRLS)@DLLDIR@ -l3270
89 LIB270_CFLAGS=-I../../../src/include 90 LIB270_CFLAGS=-I../../../src/include
src/plugins/dbus3270/Makefile.in
  Diff comments   View file @773a485
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
27 # 27 #
28 28
29 PACKAGE_NAME=@PACKAGE_NAME@ 29 PACKAGE_NAME=@PACKAGE_NAME@
  30 +PACKAGE_TARNAME=@PACKAGE_TARNAME@
30 MODULE_NAME=dbus3270 31 MODULE_NAME=dbus3270
31 32
32 prefix=@prefix@ 33 prefix=@prefix@
@@ -83,14 +84,14 @@ GLIB_LIBS=@GLIB_LIBS@ @@ -83,14 +84,14 @@ GLIB_LIBS=@GLIB_LIBS@
83 GTK_LIBS=@GTK_LIBS@ 84 GTK_LIBS=@GTK_LIBS@
84 85
85 ifeq ($(LIB3270_MODE),Debug) 86 ifeq ($(LIB3270_MODE),Debug)
86 - PW3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -lpw3270 87 + PW3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l$(PACKAGE_TARNAME)
87 PW3270_CFLAGS=-I../../../src/include 88 PW3270_CFLAGS=-I../../../src/include
88 LIB3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l3270 89 LIB3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l3270
89 LIB3270_CFLAGS=-I../../../src/include 90 LIB3270_CFLAGS=-I../../../src/include
90 endif 91 endif
91 92
92 ifeq ($(LIB3270_MODE),Release) 93 ifeq ($(LIB3270_MODE),Release)
93 - PW3270_LIBS=-L../../../.bin/Release@DLLDIR@ -lpw3270 94 + PW3270_LIBS=-L../../../.bin/Release@DLLDIR@ -l$(PACKAGE_TARNAME)
94 PW3270_CFLAGS=-I../../../src/include 95 PW3270_CFLAGS=-I../../../src/include
95 LIB3270_LIBS=-L../../../.bin/Release@DLLDIR@ -l3270 96 LIB3270_LIBS=-L../../../.bin/Release@DLLDIR@ -l3270
96 LIB3270_CFLAGS=-I../../../src/include 97 LIB3270_CFLAGS=-I../../../src/include
src/plugins/hllapi/Makefile.in
  Diff comments   View file @773a485
@@ -61,14 +61,14 @@ DEBUG_CFLAGS=-DDEBUG=1 -g -Wall @@ -61,14 +61,14 @@ DEBUG_CFLAGS=-DDEBUG=1 -g -Wall
61 LIB3270_MODE ?= Default 61 LIB3270_MODE ?= Default
62 62
63 ifeq ($(LIB3270_MODE),Debug) 63 ifeq ($(LIB3270_MODE),Debug)
64 - PW3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -lpw3270 -l3270 64 + PW3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l@PACKAGE_TARNAME@ -l3270
65 PW3270_CFLAGS=-I../../../src/include 65 PW3270_CFLAGS=-I../../../src/include
66 LIB3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l3270 66 LIB3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l3270
67 LIB3270_CFLAGS=-I../../../src/include 67 LIB3270_CFLAGS=-I../../../src/include
68 endif 68 endif
69 69
70 ifeq ($(LIB3270_MODE),Release) 70 ifeq ($(LIB3270_MODE),Release)
71 - PW3270_LIBS=-L../../../.bin/Release@DLLDIR@ -lpw3270 -l3270 71 + PW3270_LIBS=-L../../../.bin/Release@DLLDIR@ -l@PACKAGE_TARNAME@ -l3270
72 PW3270_CFLAGS=-I../../../src/include 72 PW3270_CFLAGS=-I../../../src/include
73 LIB3270_LIBS=-L../../../.bin/Release@DLLDIR@ -l3270 73 LIB3270_LIBS=-L../../../.bin/Release@DLLDIR@ -l3270
74 LIB3270_CFLAGS=-I../../../src/include 74 LIB3270_CFLAGS=-I../../../src/include
src/pw3270/Makefile.in
  Diff comments   View file @773a485
@@ -198,11 +198,11 @@ $(DEBDIR)/pw3270.install: Makefile @@ -198,11 +198,11 @@ $(DEBDIR)/pw3270.install: Makefile
198 198
199 v3270/marshal.h: v3270/genmarshal 199 v3270/marshal.h: v3270/genmarshal
200 @$(MKDIR) `dirname $@` 200 @$(MKDIR) `dirname $@`
201 - @glib-genmarshal --prefix=$(PACKAGE_NAME) --header v3270/genmarshal > $@ 201 + @glib-genmarshal --prefix=v3270 --header v3270/genmarshal > $@
202 202
203 v3270/marshal.c: v3270/genmarshal v3270/marshal.h 203 v3270/marshal.c: v3270/genmarshal v3270/marshal.h
204 @$(MKDIR) `dirname $@` 204 @$(MKDIR) `dirname $@`
205 - @glib-genmarshal --prefix=$(PACKAGE_NAME) --body v3270/genmarshal > $@ 205 + @glib-genmarshal --prefix=v3270 --body v3270/genmarshal > $@
206 206
207 $(BINDIR)/pot/pw3270.pot: $(foreach SRC, $(basename $(APP_SOURCES) $(LIB_SOURCES)), $(TMPDIR)/pot/$(SRC).pot) 207 $(BINDIR)/pot/pw3270.pot: $(foreach SRC, $(basename $(APP_SOURCES) $(LIB_SOURCES)), $(TMPDIR)/pot/$(SRC).pot)
208 @rm -f $@ 208 @rm -f $@
src/pw3270/v3270/widget.c
  Diff comments   View file @773a485
@@ -404,7 +404,7 @@ static void v3270_class_init(v3270Class *klass) @@ -404,7 +404,7 @@ static void v3270_class_init(v3270Class *klass)
404 G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, 404 G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
405 G_STRUCT_OFFSET (v3270Class, activate), 405 G_STRUCT_OFFSET (v3270Class, activate),
406 NULL, NULL, 406 NULL, NULL,
407 - pw3270_VOID__VOID, 407 + v3270_VOID__VOID,
408 G_TYPE_NONE, 0); 408 G_TYPE_NONE, 0);
409 409
410 v3270_widget_signal[SIGNAL_TOGGLE_CHANGED] = 410 v3270_widget_signal[SIGNAL_TOGGLE_CHANGED] =
@@ -413,7 +413,7 @@ static void v3270_class_init(v3270Class *klass) @@ -413,7 +413,7 @@ static void v3270_class_init(v3270Class *klass)
413 G_SIGNAL_RUN_FIRST, 413 G_SIGNAL_RUN_FIRST,
414 G_STRUCT_OFFSET (v3270Class, toggle_changed), 414 G_STRUCT_OFFSET (v3270Class, toggle_changed),
415 NULL, NULL, 415 NULL, NULL,
416 - pw3270_VOID__VOID_ENUM_BOOL_POINTER, 416 + v3270_VOID__VOID_ENUM_BOOL_POINTER,
417 G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_BOOLEAN, G_TYPE_STRING); 417 G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_BOOLEAN, G_TYPE_STRING);
418 418
419 v3270_widget_signal[SIGNAL_MESSAGE_CHANGED] = 419 v3270_widget_signal[SIGNAL_MESSAGE_CHANGED] =
@@ -422,7 +422,7 @@ static void v3270_class_init(v3270Class *klass) @@ -422,7 +422,7 @@ static void v3270_class_init(v3270Class *klass)
422 G_SIGNAL_RUN_FIRST, 422 G_SIGNAL_RUN_FIRST,
423 G_STRUCT_OFFSET (v3270Class, message_changed), 423 G_STRUCT_OFFSET (v3270Class, message_changed),
424 NULL, NULL, 424 NULL, NULL,
425 - pw3270_VOID__VOID_ENUM, 425 + v3270_VOID__VOID_ENUM,
426 G_TYPE_NONE, 1, G_TYPE_UINT); 426 G_TYPE_NONE, 1, G_TYPE_UINT);
427 427
428 v3270_widget_signal[SIGNAL_LUNAME_CHANGED] = 428 v3270_widget_signal[SIGNAL_LUNAME_CHANGED] =
@@ -431,7 +431,7 @@ static void v3270_class_init(v3270Class *klass) @@ -431,7 +431,7 @@ static void v3270_class_init(v3270Class *klass)
431 G_SIGNAL_RUN_FIRST, 431 G_SIGNAL_RUN_FIRST,
432 G_STRUCT_OFFSET (v3270Class, luname_changed), 432 G_STRUCT_OFFSET (v3270Class, luname_changed),
433 NULL, NULL, 433 NULL, NULL,
434 - pw3270_VOID__VOID_POINTER, 434 + v3270_VOID__VOID_POINTER,
435 G_TYPE_NONE, 1, G_TYPE_STRING); 435 G_TYPE_NONE, 1, G_TYPE_STRING);
436 436
437 v3270_widget_signal[SIGNAL_KEYPRESS] = 437 v3270_widget_signal[SIGNAL_KEYPRESS] =
@@ -440,7 +440,7 @@ static void v3270_class_init(v3270Class *klass) @@ -440,7 +440,7 @@ static void v3270_class_init(v3270Class *klass)
440 G_SIGNAL_RUN_LAST, 440 G_SIGNAL_RUN_LAST,
441 G_STRUCT_OFFSET (v3270Class, keypress), 441 G_STRUCT_OFFSET (v3270Class, keypress),
442 NULL, NULL, 442 NULL, NULL,
443 - pw3270_BOOL__VOID_UINT_ENUM, 443 + v3270_BOOL__VOID_UINT_ENUM,
444 G_TYPE_BOOLEAN, 2, G_TYPE_UINT, G_TYPE_UINT); 444 G_TYPE_BOOLEAN, 2, G_TYPE_UINT, G_TYPE_UINT);
445 445
446 v3270_widget_signal[SIGNAL_CONNECTED] = 446 v3270_widget_signal[SIGNAL_CONNECTED] =
@@ -449,7 +449,7 @@ static void v3270_class_init(v3270Class *klass) @@ -449,7 +449,7 @@ static void v3270_class_init(v3270Class *klass)
449 G_SIGNAL_RUN_FIRST, 449 G_SIGNAL_RUN_FIRST,
450 0, 450 0,
451 NULL, NULL, 451 NULL, NULL,
452 - pw3270_VOID__POINTER, 452 + v3270_VOID__POINTER,
453 G_TYPE_NONE, 1, G_TYPE_STRING); 453 G_TYPE_NONE, 1, G_TYPE_STRING);
454 454
455 v3270_widget_signal[SIGNAL_DISCONNECTED] = 455 v3270_widget_signal[SIGNAL_DISCONNECTED] =
@@ -458,7 +458,7 @@ static void v3270_class_init(v3270Class *klass) @@ -458,7 +458,7 @@ static void v3270_class_init(v3270Class *klass)
458 G_SIGNAL_RUN_FIRST, 458 G_SIGNAL_RUN_FIRST,
459 0, 459 0,
460 NULL, NULL, 460 NULL, NULL,
461 - pw3270_VOID__VOID, 461 + v3270_VOID__VOID,
462 G_TYPE_NONE, 0); 462 G_TYPE_NONE, 0);
463 463
464 v3270_widget_signal[SIGNAL_UPDATE_CONFIG] = 464 v3270_widget_signal[SIGNAL_UPDATE_CONFIG] =
@@ -467,7 +467,7 @@ static void v3270_class_init(v3270Class *klass) @@ -467,7 +467,7 @@ static void v3270_class_init(v3270Class *klass)
467 G_SIGNAL_RUN_FIRST, 467 G_SIGNAL_RUN_FIRST,
468 0, 468 0,
469 NULL, NULL, 469 NULL, NULL,
470 - pw3270_VOID__VOID_POINTER_POINTER, 470 + v3270_VOID__VOID_POINTER_POINTER,
471 G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); 471 G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
472 472
473 v3270_widget_signal[SIGNAL_MODEL_CHANGED] = 473 v3270_widget_signal[SIGNAL_MODEL_CHANGED] =
@@ -476,7 +476,7 @@ static void v3270_class_init(v3270Class *klass) @@ -476,7 +476,7 @@ static void v3270_class_init(v3270Class *klass)
476 G_SIGNAL_RUN_FIRST, 476 G_SIGNAL_RUN_FIRST,
477 0, 477 0,
478 NULL, NULL, 478 NULL, NULL,
479 - pw3270_VOID__VOID_UINT_POINTER, 479 + v3270_VOID__VOID_UINT_POINTER,
480 G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING); 480 G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
481 481
482 v3270_widget_signal[SIGNAL_SELECTING] = 482 v3270_widget_signal[SIGNAL_SELECTING] =
@@ -485,7 +485,7 @@ static void v3270_class_init(v3270Class *klass) @@ -485,7 +485,7 @@ static void v3270_class_init(v3270Class *klass)
485 G_SIGNAL_RUN_FIRST, 485 G_SIGNAL_RUN_FIRST,
486 0, 486 0,
487 NULL, NULL, 487 NULL, NULL,
488 - pw3270_VOID__VOID_BOOL, 488 + v3270_VOID__VOID_BOOL,
489 G_TYPE_NONE, 1, G_TYPE_BOOLEAN); 489 G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
490 490
491 v3270_widget_signal[SIGNAL_POPUP] = 491 v3270_widget_signal[SIGNAL_POPUP] =
@@ -494,7 +494,7 @@ static void v3270_class_init(v3270Class *klass) @@ -494,7 +494,7 @@ static void v3270_class_init(v3270Class *klass)
494 G_SIGNAL_RUN_LAST, 494 G_SIGNAL_RUN_LAST,
495 0, 495 0,
496 NULL, NULL, 496 NULL, NULL,
497 - pw3270_BOOL__VOID_BOOL_BOOL_POINTER, 497 + v3270_BOOL__VOID_BOOL_BOOL_POINTER,
498 G_TYPE_BOOLEAN, 3, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_POINTER); 498 G_TYPE_BOOLEAN, 3, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_POINTER);
499 499
500 v3270_widget_signal[SIGNAL_PASTENEXT] = 500 v3270_widget_signal[SIGNAL_PASTENEXT] =
@@ -503,7 +503,7 @@ static void v3270_class_init(v3270Class *klass) @@ -503,7 +503,7 @@ static void v3270_class_init(v3270Class *klass)
503 G_SIGNAL_RUN_FIRST, 503 G_SIGNAL_RUN_FIRST,
504 0, 504 0,
505 NULL, NULL, 505 NULL, NULL,
506 - pw3270_VOID__VOID_BOOL, 506 + v3270_VOID__VOID_BOOL,
507 G_TYPE_NONE, 1, G_TYPE_BOOLEAN); 507 G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
508 508
509 v3270_widget_signal[SIGNAL_CLIPBOARD] = 509 v3270_widget_signal[SIGNAL_CLIPBOARD] =
@@ -512,7 +512,7 @@ static void v3270_class_init(v3270Class *klass) @@ -512,7 +512,7 @@ static void v3270_class_init(v3270Class *klass)
512 G_SIGNAL_RUN_FIRST, 512 G_SIGNAL_RUN_FIRST,
513 0, 513 0,
514 NULL, NULL, 514 NULL, NULL,
515 - pw3270_VOID__VOID_BOOL, 515 + v3270_VOID__VOID_BOOL,
516 G_TYPE_NONE, 1, G_TYPE_BOOLEAN); 516 G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
517 517
518 v3270_widget_signal[SIGNAL_CHANGED] = 518 v3270_widget_signal[SIGNAL_CHANGED] =
@@ -521,7 +521,7 @@ static void v3270_class_init(v3270Class *klass) @@ -521,7 +521,7 @@ static void v3270_class_init(v3270Class *klass)
521 G_SIGNAL_RUN_FIRST, 521 G_SIGNAL_RUN_FIRST,
522 0, 522 0,
523 NULL, NULL, 523 NULL, NULL,
524 - pw3270_VOID__VOID_UINT_UINT, 524 + v3270_VOID__VOID_UINT_UINT,
525 G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); 525 G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
526 526
527 v3270_widget_signal[SIGNAL_MESSAGE] = 527 v3270_widget_signal[SIGNAL_MESSAGE] =
@@ -530,7 +530,7 @@ static void v3270_class_init(v3270Class *klass) @@ -530,7 +530,7 @@ static void v3270_class_init(v3270Class *klass)
530 G_SIGNAL_RUN_FIRST, 530 G_SIGNAL_RUN_FIRST,
531 G_STRUCT_OFFSET (v3270Class, popup_message), 531 G_STRUCT_OFFSET (v3270Class, popup_message),
532 NULL, NULL, 532 NULL, NULL,
533 - pw3270_VOID__VOID_UINT_POINTER_POINTER_POINTER, 533 + v3270_VOID__VOID_UINT_POINTER_POINTER_POINTER,
534 G_TYPE_NONE, 4, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); 534 G_TYPE_NONE, 4, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
535 535
536 v3270_widget_signal[SIGNAL_FIELD] = 536 v3270_widget_signal[SIGNAL_FIELD] =
@@ -539,7 +539,7 @@ static void v3270_class_init(v3270Class *klass) @@ -539,7 +539,7 @@ static void v3270_class_init(v3270Class *klass)
539 G_SIGNAL_RUN_LAST, 539 G_SIGNAL_RUN_LAST,
540 0, 540 0,
541 NULL, NULL, 541 NULL, NULL,
542 - pw3270_BOOL__VOID_BOOL_UINT_POINTER, 542 + v3270_BOOL__VOID_BOOL_UINT_POINTER,
543 G_TYPE_BOOLEAN, 3, G_TYPE_BOOLEAN, G_TYPE_UINT, G_TYPE_POINTER); 543 G_TYPE_BOOLEAN, 3, G_TYPE_BOOLEAN, G_TYPE_UINT, G_TYPE_POINTER);
544 544
545 545
@@ -549,7 +549,7 @@ static void v3270_class_init(v3270Class *klass) @@ -549,7 +549,7 @@ static void v3270_class_init(v3270Class *klass)
549 G_SIGNAL_RUN_FIRST, 549 G_SIGNAL_RUN_FIRST,
550 0, 550 0,
551 NULL, NULL, 551 NULL, NULL,
552 - pw3270_VOID__VOID, 552 + v3270_VOID__VOID,
553 G_TYPE_NONE, 0); 553 G_TYPE_NONE, 0);
554 554
555 } 555 }