Download as
Browse Code »

Commit 42a63e402b799adc2341c704dfb58effdc3e5a98

Authored by Perry Werneck
1 parent 1863d3b6
Exists in master and in 2 other branches develop, macos

Small updates on Makefile.

Showing 2 changed files with 15 additions and 24 deletions   Show diff stats
@@ -46,7 +46,7 @@ SOURCES= \ @@ -46,7 +46,7 @@ SOURCES= \
46 $(wildcard src/core/properties/*.c) \ 46 $(wildcard src/core/properties/*.c) \
47 $(wildcard src/selection/*.c) \ 47 $(wildcard src/selection/*.c) \
48 $(wildcard src/network_modules/*.c) \ 48 $(wildcard src/network_modules/*.c) \
49 - $(BASEDIR)/.tmp/$(LIBNAME)/fallbacks.c \ 49 + $(BUILDDIR)/.tmp/$(LIBNAME)/fallbacks.c \
50 $(foreach MODULE, $(NETWORK_MODULES), $(wildcard src/network_modules/$(MODULE)/*.c)) 50 $(foreach MODULE, $(NETWORK_MODULES), $(wildcard src/network_modules/$(MODULE)/*.c))
51 51
52 TEST_SOURCES= \ 52 TEST_SOURCES= \
@@ -87,32 +87,25 @@ sysconfdir=@sysconfdir@ @@ -87,32 +87,25 @@ sysconfdir=@sysconfdir@
87 datadir=$(datarootdir)/$(PRODUCT_NAME) 87 datadir=$(datarootdir)/$(PRODUCT_NAME)
88 confdir=$(sysconfdir)/$(PRODUCT_NAME) 88 confdir=$(sysconfdir)/$(PRODUCT_NAME)
89 89
90 -BASEDIR=@BASEDIR@ 90 +BUILDDIR=@BUILDDIR@
91 91
92 -POTDIR=$(BASEDIR)/.pot 92 +POTDIR=$(BUILDDIR)/.pot
93 93
94 -OBJDIR=$(BASEDIR)/.obj 94 +OBJDIR=$(BUILDDIR)/.obj
95 OBJDBG=$(OBJDIR)/Debug 95 OBJDBG=$(OBJDIR)/Debug
96 OBJRLS=$(OBJDIR)/Release 96 OBJRLS=$(OBJDIR)/Release
97 97
98 -BINDIR=$(BASEDIR)/.bin 98 +BINDIR=$(BUILDDIR)/.bin
99 BINDBG=$(BINDIR)/Debug 99 BINDBG=$(BINDIR)/Debug
100 BINRLS=$(BINDIR)/Release 100 BINRLS=$(BINDIR)/Release
101 101
102 #---[ Rules ]---------------------------------------------------------------------------- 102 #---[ Rules ]----------------------------------------------------------------------------
103 103
104 -DEPENDS= \  
105 - Makefile \  
106 - src/include/*.h \  
107 - src/include/lib3270/*.h \  
108 - src/include/@OSNAME@/lib3270/*.h \  
109 - $(BASEDIR)/src/include/lib3270/actions.h  
110 -  
111 CFLAGS= \ 104 CFLAGS= \
112 @CFLAGS@ \ 105 @CFLAGS@ \
113 -g \ 106 -g \
114 - -I$(BASEDIR)/src/include \  
115 - -I$(BASEDIR)/src/include/@OSNAME@ \ 107 + -Isrc/include \
  108 + -Isrc/include/@OSNAME@ \
116 @LIBSSL_CFLAGS@ \ 109 @LIBSSL_CFLAGS@ \
117 @LDAP_CFLAGS@ \ 110 @LDAP_CFLAGS@ \
118 @LIBCURL_CFLAGS@ 111 @LIBCURL_CFLAGS@
@@ -131,9 +124,8 @@ LIBS= \ @@ -131,9 +124,8 @@ LIBS= \
131 #---[ Debug Rules ]---------------------------------------------------------------------- 124 #---[ Debug Rules ]----------------------------------------------------------------------
132 125
133 $(OBJDBG)/%.o: \ 126 $(OBJDBG)/%.o: \
134 - %.c \  
135 - $(DEPENDS)  
136 - 127 + %.c
  128 +
137 @echo $< ... 129 @echo $< ...
138 @$(MKDIR) $(dir $@) 130 @$(MKDIR) $(dir $@)
139 131
@@ -158,8 +150,7 @@ $(OBJDBG)/%.o: \ @@ -158,8 +150,7 @@ $(OBJDBG)/%.o: \
158 #---[ Release Rules ]-------------------------------------------------------------------- 150 #---[ Release Rules ]--------------------------------------------------------------------
159 151
160 $(OBJRLS)/%.o: \ 152 $(OBJRLS)/%.o: \
161 - %.c \  
162 - $(DEPENDS) 153 + %.c
163 154
164 @echo $< ... 155 @echo $< ...
165 @$(MKDIR) $(dir $@) 156 @$(MKDIR) $(dir $@)
@@ -232,7 +223,7 @@ all-windows: \ @@ -232,7 +223,7 @@ all-windows: \
232 223
233 @$(INSTALL_DATA) \ 224 @$(INSTALL_DATA) \
234 $(BINRLS)/$(LIBNAME).def \ 225 $(BINRLS)/$(LIBNAME).def \
235 - $(BASEDIR)/win 226 + $(BUILDDIR)/win
236 227
237 all-linux: \ 228 all-linux: \
238 $(BINRLS)/$(SONAME) \ 229 $(BINRLS)/$(SONAME) \
@@ -441,7 +432,7 @@ install-windows-dev: \ @@ -441,7 +432,7 @@ install-windows-dev: \
441 432
442 #---[ Misc Targets ]--------------------------------------------------------------------- 433 #---[ Misc Targets ]---------------------------------------------------------------------
443 434
444 -$(BASEDIR)/.tmp/$(LIBNAME)/fallbacks.c: \ 435 +$(BUILDDIR)/.tmp/$(LIBNAME)/fallbacks.c: \
445 src/core/X3270.xad \ 436 src/core/X3270.xad \
446 $(wildcard src/mkfb/*.c) 437 $(wildcard src/mkfb/*.c)
447 438
@@ -452,7 +443,7 @@ $(BASEDIR)/.tmp/$(LIBNAME)/fallbacks.c: \ @@ -452,7 +443,7 @@ $(BASEDIR)/.tmp/$(LIBNAME)/fallbacks.c: \
452 443
453 @$(HOST_CC) \ 444 @$(HOST_CC) \
454 -g \ 445 -g \
455 - -I$(BASEDIR)/src/include \ 446 + -Isrc/include \
456 -o $(BINDIR)/mkfb@EXEEXT@ \ 447 -o $(BINDIR)/mkfb@EXEEXT@ \
457 $(wildcard src/mkfb/*.c) 448 $(wildcard src/mkfb/*.c)
458 449
@@ -529,7 +520,7 @@ clean: \ @@ -529,7 +520,7 @@ clean: \
529 cleanDebug \ 520 cleanDebug \
530 cleanRelease 521 cleanRelease
531 522
532 - @rm -fr $(BASEDIR)/.tmp/$(LIBNAME) 523 + @rm -fr $(BUILDDIR)/.tmp/$(LIBNAME)
533 @rm -fr $(POTDIR)/$(LIBNAME) 524 @rm -fr $(POTDIR)/$(LIBNAME)
534 @rm -f locale/*.pot 525 @rm -f locale/*.pot
535 526
@@ -666,7 +666,7 @@ dnl Directory config @@ -666,7 +666,7 @@ dnl Directory config
666 dnl --------------------------------------------------------------------------- 666 dnl ---------------------------------------------------------------------------
667 667
668 AC_ARG_WITH([build-dir], [AS_HELP_STRING([--with-build-dir], [Setup build path])], [ app_cv_buildir="$withval" ],[ app_cv_buildir="$ac_pwd" ]) 668 AC_ARG_WITH([build-dir], [AS_HELP_STRING([--with-build-dir], [Setup build path])], [ app_cv_buildir="$withval" ],[ app_cv_buildir="$ac_pwd" ])
669 -AC_SUBST(BASEDIR,$app_cv_buildir) 669 +AC_SUBST(BUILDDIR,$app_cv_buildir)
670 670
671 dnl --------------------------------------------------------------------------- 671 dnl ---------------------------------------------------------------------------
672 dnl Configure which files to generate. 672 dnl Configure which files to generate.