diff options
| author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-05 21:27:04 +0000 |
|---|---|---|
| committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-05 21:27:04 +0000 |
| commit | 9ed4fe37f7d801437023bfe509d503b4b223fac4 (patch) | |
| tree | 2e93ac16c408cd4dff4f4d3b1070120f162c50ee /Makefile | |
| parent | d3d49dd21b8b466bd68f3e7b0621c09291076f05 (diff) | |
Move the last instance of AST_LIBS to the only place it is used,
namely main/Makefile .
I am unclear where decisions on the build environment (CFLAGS,
LDFLAGS, LIBS and so on) should be made - right now they are
split here and there.
As a first step in cleaning up this situation, i am trying to at
least collect all instances of each variable in one place.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@88767 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -15,7 +15,6 @@ # # ASTCFLAGS - compiler options # ASTLDFLAGS - linker flags (not libraries) -# AST_LIBS - libraries to build binaries XXX # LIBS - additional libraries, at top-level for all links, # on a single object just for that object # SOLINK - linker flags used only for creating shared objects (.so files), @@ -229,7 +228,6 @@ ifeq ($(OSARCH),FreeBSD) # -V is understood by BSD Make, not by GNU make. BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) - AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) endif ifeq ($(OSARCH),NetBSD) @@ -348,7 +346,7 @@ main: $(filter-out main,$(MOD_SUBDIRS)) $(MOD_SUBDIRS): @echo " [enter MOD_SUBDIR $@/]" - @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AST_LIBS="$(AST_LIBS)" $(MAKE) --no-print-directory --no-builtin-rules -C $@ SUBDIR=$@ all + @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) --no-print-directory --no-builtin-rules -C $@ SUBDIR=$@ all @echo " [exit MOD_SUBDIR $@/]" $(OTHER_SUBDIRS): |