Acertando Makefile do diálogo de transferência de arquivos.

Perry Werneck
1 parent 05dfe586
Showing 6 changed files with 26 additions and 94 deletions Show diff stats
configure.ac
src/pw3270/ft/Makefile.in
src/pw3270/ft/ft.cbp
src/pw3270/ft/ftdialog.c
src/pw3270/ft/testprogram.c
src/pw3270/ft/v3270ft.h
@@ -63,6 +63,7 @@ AC_PROG_MKDIR_P
 AC_PROG_LN_S
  
 AC_PATH_TOOL([VALGRIND], [valgrind], [no])
+AC_PATH_TOOL([AR], [ar], [ar])
  
 AC_PATH_TOOL([MAKENSIS], [makensis], [no])
 AC_PATH_TOOL([WINDRES], [windres], [no])
@@ -26,7 +26,7 @@
  
 MODULE_NAME=ft3270
  
-SOURCES=ftdialog.c ftprogress.c
+SOURCES=ftdialog.c ftprogress.c browse.c
  
 #---[ Paths ]------------------------------------------------------------------
  
@@ -43,6 +43,7 @@ desktopdir=$(datarootdir)/applications
 MKDIR=@MKDIR_P@
 CC=@CC@
 LD=@CC@
+AR=@AR@
  
 #---[ Environment ]------------------------------------------------------------
  
@@ -53,7 +54,7 @@ CFLAGS=@CFLAGS@ @DLL_CFLAGS@ @GTK_CFLAGS@ @GTKMAC_CFLAGS@ -DLIBDIR=\&quot;$(libdir)\&quot;
 LIBS=@LIBS@ @GTK_LIBS@ @GTKMAC_LIBS@
  
 DEBUG_CFLAGS=-DDEBUG=1 -g -Wall
-DEPENDS ?= *.h ../../include/*.h ../../include/lib3270/*.h
+DEPENDS ?= *.h ../../include/*.h ../../include/lib3270/*.h Makefile
  
 #---[ Paths ]------------------------------------------------------------------
  
@@ -83,28 +84,39 @@ $(OBJRLS)/%.o: %.c $(DEPENDS)
  
 #---[ Targets ]----------------------------------------------------------------
  
+Release: \
+	$(BINRLS)/$(MODULE_NAME).a
+
 Debug: \
 	$(BINDBG)/$(MODULE_NAME)@EXEEXT@
  
 run: \
 	$(BINDBG)/$(MODULE_NAME)@EXEEXT@
-
 	@$(BINDBG)/$(MODULE_NAME)@EXEEXT@
  
+$(BINDBG)/$(MODULE_NAME).a: \
+	$(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o)
+
+	@$(MKDIR) `dirname $@`
+	@$(AR) rcs $@ $^
+
+$(BINRLS)/$(MODULE_NAME).a: \
+	$(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o)
+
+	@$(MKDIR) `dirname $@`
+	@$(AR) rcs $@ $^
+
 $(BINDBG)/$(MODULE_NAME)@EXEEXT@: \
 	$(OBJDBG)/testprogram.o \
 	$(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o)
  
 	@$(MKDIR) `dirname $@`
-	@$(LD) @LDARCH@ @DBGRPATH@ \
-		-o $@ \
-		$(OBJDBG)/testprogram.o \
-		$(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) $(LIBS)
+	@$(LD) @LDARCH@ @DBGRPATH@ -o $@ $^ $(LIBS)
  
 cleanDebug: \
 	clean
  
-clean: 
+clean:
 	@rm -fr .bin
 	@rm -fr .obj
  
@@ -39,12 +39,16 @@
 			<Add option="`pkg-config --libs gtk+-3.0`" />
 		</Linker>
 		<Unit filename="Makefile.in" />
+		<Unit filename="browse.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="ftdialog.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="ftprogress.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="private.h" />
 		<Unit filename="testprogram.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -27,60 +27,7 @@
  *
  */
  
- #include "v3270ft.h"
-
-/*--[ Widget definition ]----------------------------------------------------------------------------*/
-
- enum _filename
- {
- 	FILENAME_LOCAL,
- 	FILENAME_HOST,
-
-	FILENAME_COUNT
- };
-
- enum _value
- {
- 	VALUE_LRECL,
- 	VALUE_BLKSIZE,
- 	VALUE_PRIMSPACE,
- 	VALUE_SECSPACE,
- 	VALUE_DFT,
-
- 	VALUE_COUNT
- };
-
- enum _button
- {
-	BUTTON_ASCII,
-	BUTTON_CRLF,
-	BUTTON_APPEND,
-	BUTTON_REMAP,
-
- 	BUTTON_COUNT
- };
-
- struct _v3270FTD
- {
-	GtkDialog			  parent;
-	GtkWidget			* filename[FILENAME_COUNT];	/**< Filenames for the transfer */
-	GtkWidget			* units;					/**< Units frame box */
-	GtkWidget			* ready;					/**< Send/Save button */
-	GtkToggleButton		* button[BUTTON_COUNT];		/**< Buttons */
-	GtkToggleButton 	* recfm[4];					/**< Record format buttons */
-	GtkToggleButton 	* btnUnits[4];				/**< Unit buttons */
-	GtkSpinButton		* value[VALUE_COUNT];
-	gboolean 			  local;					/**< TRUE if local filename is ok */
-	gboolean			  remote;					/**< TRUE if remote filename is ok */
-	LIB3270_FT_OPTION	  options;
- };
-
- struct _v3270FTDClass
- {
-	GtkDialogClass parent_class;
-
-	int dummy;
- };
+ #include "private.h"
  
  G_DEFINE_TYPE(v3270FTD, v3270FTD, GTK_TYPE_DIALOG);
  
@@ -122,35 +69,6 @@ static void v3270FTD_init(v3270FTD *widget)
 {
 }
  
-static void browse_file(GtkButton *button,v3270FTD *parent)
-{
-	gboolean	  recv		= (parent->options & LIB3270_FT_OPTION_RECEIVE);
-	GtkWidget 	* dialog	= gtk_file_chooser_dialog_new
-	(
-		recv ? _( "Select file to receive" ) : _( "Select file to send" ),
-		GTK_WINDOW(parent),
-		GTK_FILE_CHOOSER_ACTION_OPEN,
-		_("_Cancel" ),	GTK_RESPONSE_CANCEL,
-		recv ? _("_Save") : _("_Send"), GTK_RESPONSE_ACCEPT,
-		NULL
-	);
-
-	const gchar * current = gtk_entry_get_text(GTK_ENTRY(parent->filename[FILENAME_LOCAL]));
-	if(current && *current)
-		gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),current);
-
-	if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
-	{
-		gchar *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
-		gtk_entry_set_text(GTK_ENTRY(parent->filename[FILENAME_LOCAL]),filename);
-		g_free(filename);
-	}
-
-	gtk_widget_destroy(dialog);
-
-
-}
-
 static void toggle_option(GtkToggleButton *button, v3270FTD *dialog)
 {
 	const struct ftoptions *opt = (const struct ftoptions *) g_object_get_data(G_OBJECT(button),"cfg");
@@ -34,8 +34,6 @@
  
 int main (int argc, char *argv[])
 {
-//	GtkWidget *win;
-
 	gtk_init (&argc, &argv);
  
 	{
@@ -99,7 +99,6 @@
  LIB3270_EXPORT void				  v3270_ft_progress_complete(GtkWidget *widget,unsigned long length,double kbytes_sec);
  
  
-
  G_END_DECLS
  
 #endif // V3270_H_INCLUDED
...	...	@@ -63,6 +63,7 @@ AC_PROG_MKDIR_P
63	63	AC_PROG_LN_S
64	64
65	65	AC_PATH_TOOL([VALGRIND], [valgrind], [no])
	66	+AC_PATH_TOOL([AR], [ar], [ar])
66	67
67	68	AC_PATH_TOOL([MAKENSIS], [makensis], [no])
68	69	AC_PATH_TOOL([WINDRES], [windres], [no])
...	...
...	...	@@ -26,7 +26,7 @@
26	26
27	27	MODULE_NAME=ft3270
28	28
29		-SOURCES=ftdialog.c ftprogress.c
	29	+SOURCES=ftdialog.c ftprogress.c browse.c
30	30
31	31	#---[ Paths ]------------------------------------------------------------------
32	32
...	...	@@ -43,6 +43,7 @@ desktopdir=$(datarootdir)/applications
43	43	MKDIR=@MKDIR_P@
44	44	CC=@CC@
45	45	LD=@CC@
	46	+AR=@AR@
46	47
47	48	#---[ Environment ]------------------------------------------------------------
48	49
...	...	@@ -53,7 +54,7 @@ CFLAGS=@CFLAGS@ @DLL_CFLAGS@ @GTK_CFLAGS@ @GTKMAC_CFLAGS@ -DLIBDIR=\"$(libdir)\"
53	54	LIBS=@LIBS@ @GTK_LIBS@ @GTKMAC_LIBS@
54	55
55	56	DEBUG_CFLAGS=-DDEBUG=1 -g -Wall
56		-DEPENDS ?= .h ../../include/.h ../../include/lib3270/*.h
	57	+DEPENDS ?= .h ../../include/.h ../../include/lib3270/*.h Makefile
57	58
58	59	#---[ Paths ]------------------------------------------------------------------
59	60
...	...	@@ -83,28 +84,39 @@ $(OBJRLS)/%.o: %.c $(DEPENDS)
83	84
84	85	#---[ Targets ]----------------------------------------------------------------
85	86
	87	+Release: \
	88	+ $(BINRLS)/$(MODULE_NAME).a
	89	+
86	90	Debug: \
87	91	$(BINDBG)/$(MODULE_NAME)@EXEEXT@
88	92
89	93	run: \
90	94	$(BINDBG)/$(MODULE_NAME)@EXEEXT@
91		-
92	95	@$(BINDBG)/$(MODULE_NAME)@EXEEXT@
93	96
	97	+$(BINDBG)/$(MODULE_NAME).a: \
	98	+ $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o)
	99	+
	100	+ @$(MKDIR) `dirname $@`
	101	+ @$(AR) rcs $@ $^
	102	+
	103	+$(BINRLS)/$(MODULE_NAME).a: \
	104	+ $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o)
	105	+
	106	+ @$(MKDIR) `dirname $@`
	107	+ @$(AR) rcs $@ $^
	108	+
94	109	$(BINDBG)/$(MODULE_NAME)@EXEEXT@: \
95	110	$(OBJDBG)/testprogram.o \
96	111	$(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o)
97	112
98	113	@$(MKDIR) `dirname $@`
99		- @$(LD) @LDARCH@ @DBGRPATH@ \
100		- -o $@ \
101		- $(OBJDBG)/testprogram.o \
102		- $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) $(LIBS)
	114	+ @$(LD) @LDARCH@ @DBGRPATH@ -o $@ $^ $(LIBS)
103	115
104	116	cleanDebug: \
105	117	clean
106	118
107		-clean:
	119	+clean:
108	120	@rm -fr .bin
109	121	@rm -fr .obj
110	122
...	...
...	...	@@ -39,12 +39,16 @@
39	39	<Add option="`pkg-config --libs gtk+-3.0`" />
40	40	</Linker>
41	41	<Unit filename="Makefile.in" />
	42	+ <Unit filename="browse.c">
	43	+ <Option compilerVar="CC" />
	44	+ </Unit>
42	45	<Unit filename="ftdialog.c">
43	46	<Option compilerVar="CC" />
44	47	</Unit>
45	48	<Unit filename="ftprogress.c">
46	49	<Option compilerVar="CC" />
47	50	</Unit>
	51	+ <Unit filename="private.h" />
48	52	<Unit filename="testprogram.c">
49	53	<Option compilerVar="CC" />
50	54	</Unit>
...	...
...	...	@@ -27,60 +27,7 @@
27	27	*
28	28	*/
29	29
30		- #include "v3270ft.h"
31		-
32		-/--[ Widget definition ]----------------------------------------------------------------------------/
33		-
34		- enum _filename
35		- {
36		- FILENAME_LOCAL,
37		- FILENAME_HOST,
38		-
39		- FILENAME_COUNT
40		- };
41		-
42		- enum _value
43		- {
44		- VALUE_LRECL,
45		- VALUE_BLKSIZE,
46		- VALUE_PRIMSPACE,
47		- VALUE_SECSPACE,
48		- VALUE_DFT,
49		-
50		- VALUE_COUNT
51		- };
52		-
53		- enum _button
54		- {
55		- BUTTON_ASCII,
56		- BUTTON_CRLF,
57		- BUTTON_APPEND,
58		- BUTTON_REMAP,
59		-
60		- BUTTON_COUNT
61		- };
62		-
63		- struct _v3270FTD
64		- {
65		- GtkDialog parent;
66		- GtkWidget * filename[FILENAME_COUNT]; /*< Filenames for the transfer /
67		- GtkWidget * units; /*< Units frame box /
68		- GtkWidget * ready; /*< Send/Save button /
69		- GtkToggleButton * button[BUTTON_COUNT]; /*< Buttons /
70		- GtkToggleButton * recfm[4]; /*< Record format buttons /
71		- GtkToggleButton * btnUnits[4]; /*< Unit buttons /
72		- GtkSpinButton * value[VALUE_COUNT];
73		- gboolean local; /*< TRUE if local filename is ok /
74		- gboolean remote; /*< TRUE if remote filename is ok /
75		- LIB3270_FT_OPTION options;
76		- };
77		-
78		- struct _v3270FTDClass
79		- {
80		- GtkDialogClass parent_class;
81		-
82		- int dummy;
83		- };
	30	+ #include "private.h"
84	31
85	32	G_DEFINE_TYPE(v3270FTD, v3270FTD, GTK_TYPE_DIALOG);
86	33
...	...	@@ -122,35 +69,6 @@ static void v3270FTD_init(v3270FTD *widget)
122	69	{
123	70	}
124	71
125		-static void browse_file(GtkButton button,v3270FTD parent)
126		-{
127		- gboolean recv = (parent->options & LIB3270_FT_OPTION_RECEIVE);
128		- GtkWidget * dialog = gtk_file_chooser_dialog_new
129		- (
130		- recv ? _( "Select file to receive" ) : _( "Select file to send" ),
131		- GTK_WINDOW(parent),
132		- GTK_FILE_CHOOSER_ACTION_OPEN,
133		- _("_Cancel" ), GTK_RESPONSE_CANCEL,
134		- recv ? _("_Save") : _("_Send"), GTK_RESPONSE_ACCEPT,
135		- NULL
136		- );
137		-
138		- const gchar * current = gtk_entry_get_text(GTK_ENTRY(parent->filename[FILENAME_LOCAL]));
139		- if(current && *current)
140		- gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),current);
141		-
142		- if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
143		- {
144		- gchar *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
145		- gtk_entry_set_text(GTK_ENTRY(parent->filename[FILENAME_LOCAL]),filename);
146		- g_free(filename);
147		- }
148		-
149		- gtk_widget_destroy(dialog);
150		-
151		-
152		-}
153		-
154	72	static void toggle_option(GtkToggleButton button, v3270FTD dialog)
155	73	{
156	74	const struct ftoptions opt = (const struct ftoptions ) g_object_get_data(G_OBJECT(button),"cfg");
...	...
...	...	@@ -34,8 +34,6 @@
34	34
35	35	int main (int argc, char *argv[])
36	36	{
37		-// GtkWidget *win;
38		-
39	37	gtk_init (&argc, &argv);
40	38
41	39	{
...	...
...	...	@@ -99,7 +99,6 @@
99	99	LIB3270_EXPORT void v3270_ft_progress_complete(GtkWidget *widget,unsigned long length,double kbytes_sec);
100	100
101	101
102		-
103	102	G_END_DECLS
104	103
105	104	#endif // V3270_H_INCLUDED
...	...