[teklib-general] changeset in /hg/teklib/current: install target no longer depend...
Timm S. Mueller
tmueller at neoscientists.org
Mon Nov 26 16:22:09 CET 2007
changeset 1daea84640d3 in /hg/teklib/current
details: http://teklib.org:8001/hg/teklib/current?cmd=changeset;node=1daea84640d3
description:
install target no longer depends on modules and libs; must be invoked seperately
diffs (209 lines):
diff -r 78b3f6a96668 -r 1daea84640d3 Makefile
--- a/Makefile Mon Aug 20 15:10:59 2007 +0200
+++ b/Makefile Mon Aug 20 16:11:15 2007 +0200
@@ -53,8 +53,8 @@ linux_small: build/tmk_posix_linux_gcc_s
linux_small: build/tmk_posix_linux_gcc_small
@TEKLIB=$(TEKLIB) $(MAKE) -s -f $? all
-linux_install: build/tmk_posix_linux_gcc_release
- @TEKLIB=$(TEKLIB) $(MAKE) -s -f $? all install
+linux_install: build/tmk_posix_linux
+ @TEKLIB=$(TEKLIB) $(MAKE) -s -f $? install
linux_debug: build/tmk_posix_linux_gcc_debug
@TEKLIB=$(TEKLIB) $(MAKE) -s -f $? all
@@ -95,8 +95,8 @@ fbsd_release: build/tmk_posix_fbsd_gcc_r
fbsd_release: build/tmk_posix_fbsd_gcc_release
@$(MAKE) -s -f $? all
-fbsd_install: build/tmk_posix_fbsd_gcc_release
- @$(MAKE) -s -f $? all install
+fbsd_install: build/tmk_posix_fbsd
+ @$(MAKE) -s -f $? install
fbsd_debug: build/tmk_posix_fbsd_gcc_debug
@$(MAKE) -s -f $? all
@@ -131,8 +131,8 @@ winnt_gcc_release: build/tmk_winnt_winnt
winnt_gcc_release: build/tmk_winnt_winnt_gcc_release
@$(MAKE) -s -f $? all
-winnt_gcc_install: build/tmk_winnt_winnt_gcc_release
- @$(MAKE) -s -f $? all install
+winnt_gcc_install: build/tmk_winnt_winnt_gcc
+ @$(MAKE) -s -f $? install
winnt_gcc_debug: build/tmk_winnt_winnt_gcc_debug
@$(MAKE) -s -f $? all
diff -r 78b3f6a96668 -r 1daea84640d3 build/builds.tmk
--- a/build/builds.tmk Mon Aug 20 15:10:59 2007 +0200
+++ b/build/builds.tmk Mon Aug 20 16:11:15 2007 +0200
@@ -132,7 +132,7 @@
sources: PHONY
modules: libs
tools: libs
- install: libs
+ install: PHONY
do_install: install
[/body]
@@ -156,7 +156,7 @@
modules: libs
tools: libs
- install: libs
+ install: PHONY
do_install: install
[/body]
@@ -180,7 +180,7 @@
sources: PHONY
modules: PHONY
- install: libs
+ install: PHONY
do_install: install
[/body]
diff -r 78b3f6a96668 -r 1daea84640d3 build/config/posix_fbsd.tmk
--- a/build/config/posix_fbsd.tmk Mon Aug 20 15:10:59 2007 +0200
+++ b/build/config/posix_fbsd.tmk Mon Aug 20 16:11:15 2007 +0200
@@ -41,9 +41,9 @@
MKDIR = mkdir -p
RM = rm
RMDIR = rm -R
-
+
CC = gcc
- AR = ar rcu
+ AR = ar rcu
LIBPREFIX = lib
LIBSUFFIX = a
@@ -51,7 +51,7 @@
[switch]
[case config="_gcc_release"]
- OPT = -O3 -fomit-frame-pointer
+ OPT = -O3 -fomit-frame-pointer
[/case]
[case config="_gcc_debug"]
OPT = -O1
@@ -62,17 +62,17 @@
DEBUG = -DTDEBUG=10 -g
[/default]
[/switch]
-
+
VOID = echo -n
[embed body="help"/]
-
+
[/body]
[body name="paths"]
INCL = -I$(TEKLIB) -I. -I./include -I/usr/X11R6/include
-
+
OBJDIR = build/obj_$(HOST)
LIBDIR = $(TEKLIB)lib/$(HOST)
BINDIR = $(TEKLIB)bin/$(HOST)
@@ -80,7 +80,7 @@
TEKSYSDIR = /usr/local/tek/
MODINSTDIR = $(TEKSYSDIR)mod
-
+
#
$(BINDIR):
@@ -132,7 +132,7 @@
MODCFLAGS = -fPIC -DPIC $(WARN) $(OPT) $(INCL) $(DEF) $(DEBUG) -DTEKHOST_SYSDIR="\\"$(TEKSYSDIR)\\""
MODLIBS = -L$(TEKLIB)lib/$(HOST) -ltek -ltekdebug $(EXTRAMODLIBS) -pthread -export-dynamic
modules: $(OBJDIR) $(BINDIR) $(MODDIR) $(LIBMODS) $(MODS)
- install: libs modules
+ install:
\t at echo "--- (IN) $(MODS)"
\t-install -d $(MODINSTDIR)
\t-install $(MODS) $(MODINSTDIR)
@@ -152,7 +152,7 @@
\tranlib $@
$(MODDIR)/%1.$(MODSUFFIX): %2
\t at echo "--- (LD) %1.$(MODSUFFIX)"
- \t$(CC) $(MODCFLAGS) %2 -shared -o $@ $(MODLIBS)
+ \t$(CC) $(MODCFLAGS) %2 -shared -o $@ $(MODLIBS)
[if config="_gcc_release"]
\tstrip --strip-unneeded --remove-section .comment $(MODDIR)/%1.$(MODSUFFIX)
[/if]
diff -r 78b3f6a96668 -r 1daea84640d3 build/config/posix_linux.tmk
--- a/build/config/posix_linux.tmk Mon Aug 20 15:10:59 2007 +0200
+++ b/build/config/posix_linux.tmk Mon Aug 20 16:11:15 2007 +0200
@@ -143,7 +143,7 @@
MODCFLAGS = -fPIC -DPIC $(WARN) $(OPT) $(INCL) $(DEF) $(DEBUG) -DTEKHOST_SYSDIR="\\"$(TEKSYSDIR)\\""
MODLIBS = -L$(TEKLIB)/lib/$(HOST) -ltek -ltekdebug $(EXTRAMODLIBS) -ldl -lpthread
modules: $(OBJDIR) $(BINDIR) $(MODDIR) $(LIBDIR) $(LIBMODS) $(MODS)
- install: libs modules
+ install:
\t at echo "--- (IN) $(MODS)"
\t-install -d $(MODINSTDIR)
\t-install $(MODS) $(MODINSTDIR)
diff -r 78b3f6a96668 -r 1daea84640d3 build/config/winnt_winnt_gcc.tmk
--- a/build/config/winnt_winnt_gcc.tmk Mon Aug 20 15:10:59 2007 +0200
+++ b/build/config/winnt_winnt_gcc.tmk Mon Aug 20 16:11:15 2007 +0200
@@ -40,8 +40,8 @@
MKDIR = mkdir -p
RM = rm
- RMDIR = rmdir
-
+ RMDIR = rmdir
+
CC = gcc -mno-cygwin -DWIN32
AR = ar rcu
@@ -73,7 +73,7 @@
[body name="paths"]
INCL = -I$(TEKLIB)/. -I. -I./include
-
+
OBJDIR = build/obj_$(HOST)
LIBDIR = $(TEKLIB)lib/$(HOST)
BINDIR = $(TEKLIB)bin/$(HOST)
@@ -83,7 +83,7 @@
MODINSTDIR = $(TEKSYSDIR)/mod
#
-
+
$(BINDIR):
\t-$(MKDIR) $(BINDIR)
$(MODDIR):
@@ -110,7 +110,7 @@
[body name="libdep"]
%1: %2 %3
\techo "--- (CC) %2"
- \t$(CC) $(LIBCFLAGS) -c %2 -o $@
+ \t$(CC) $(LIBCFLAGS) -c %2 -o $@
[/body]
[body name="liblink"]
@@ -133,7 +133,7 @@
MODCFLAGS = $(EXTRAMODFLAGS) -D_USRDLL -D_WINDOWS $(WARN) $(OPT) $(INCL) $(DEF) $(DEBUG)
MODLIBS = -L$(TEKLIB)lib/$(HOST) -ltek -ltekdebug $(EXTRAMODLIBS) $(WINLIBS)
modules: $(OBJDIR) $(BINDIR) $(MODDIR) $(LIBMODS) $(MODS)
- install: libs modules
+ install:
\t at echo "--- (IN) $(MODS)"
\t-install -d "$(MODINSTDIR)"
\t-install $(MODS) "$(MODINSTDIR)"
@@ -143,7 +143,7 @@
[body name="moddep"]
%1: %2 %3
\t at echo "--- (CC) %2"
- \t$(CC) $(MODCFLAGS) -c %2 -o $@
+ \t$(CC) $(MODCFLAGS) -c %2 -o $@
[/body]
[body name="modlink"]
More information about the teklib-general
mailing list