Commit 860f70b37d3dc67f9335dc95a759727ee59ff796
1 parent
2396c6b3
Exists in
master
and in
1 other branch
Refactoring build process
Fixing warnings
Showing
2 changed files
with
7 additions
and
6 deletions
Show diff stats
Makefile.in
@@ -237,14 +237,16 @@ $(OBJDIR)/marshal/%.o: \ | @@ -237,14 +237,16 @@ $(OBJDIR)/marshal/%.o: \ | ||
237 | all: \ | 237 | all: \ |
238 | $(BINRLS)/$(SONAME) \ | 238 | $(BINRLS)/$(SONAME) \ |
239 | $(BINRLS)/static/$(LIBNAME).a \ | 239 | $(BINRLS)/static/$(LIBNAME).a \ |
240 | - $(POTDIR)/lib3270.pot | 240 | + $(POTDIR)/$(LIBNAME).pot |
241 | 241 | ||
242 | Release: \ | 242 | Release: \ |
243 | $(BINRLS)/$(SONAME) \ | 243 | $(BINRLS)/$(SONAME) \ |
244 | $(BINRLS)/static/$(LIBNAME).a | 244 | $(BINRLS)/static/$(LIBNAME).a |
245 | 245 | ||
246 | $(BINRLS)/$(SONAME): \ | 246 | $(BINRLS)/$(SONAME): \ |
247 | - $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) | 247 | + $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) \ |
248 | + $(OBJDIR)/marshal/v3270.o \ | ||
249 | + $(OBJDIR)/marshal/v3270ft.o | ||
248 | 250 | ||
249 | @$(MKDIR) $(dir $@) | 251 | @$(MKDIR) $(dir $@) |
250 | @echo $< ... | 252 | @echo $< ... |
@@ -252,7 +254,7 @@ $(BINRLS)/$(SONAME): \ | @@ -252,7 +254,7 @@ $(BINRLS)/$(SONAME): \ | ||
252 | @DLL_LDFLAGS@ \ | 254 | @DLL_LDFLAGS@ \ |
253 | -o $@ \ | 255 | -o $@ \ |
254 | $(LDFLAGS) \ | 256 | $(LDFLAGS) \ |
255 | - $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) \ | 257 | + $^ \ |
256 | -L$(BINRLS) \ | 258 | -L$(BINRLS) \ |
257 | $(LIBS) | 259 | $(LIBS) |
258 | 260 | ||
@@ -410,9 +412,7 @@ $(BINDBG)/$(SONAME): \ | @@ -410,9 +412,7 @@ $(BINDBG)/$(SONAME): \ | ||
410 | -o $@ \ | 412 | -o $@ \ |
411 | -L$(BINDBG) \ | 413 | -L$(BINDBG) \ |
412 | $(LDFLAGS) \ | 414 | $(LDFLAGS) \ |
413 | - $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) \ | ||
414 | - $(OBJDIR)/marshal/v3270.o \ | ||
415 | - $(OBJDIR)/marshal/v3270ft.o \ | 415 | + $^ \ |
416 | $(LIBS) | 416 | $(LIBS) |
417 | 417 | ||
418 | 418 |
src/filetransfer/save.c
@@ -29,6 +29,7 @@ | @@ -29,6 +29,7 @@ | ||
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include "private.h" | 31 | #include "private.h" |
32 | + #include <v3270/dialogs.h> | ||
32 | 33 | ||
33 | /*--[ Statics ]--------------------------------------------------------------------------------------*/ | 34 | /*--[ Statics ]--------------------------------------------------------------------------------------*/ |
34 | 35 |