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