diff options
author | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-02-23 08:14:04 +0000 |
---|---|---|
committer | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-02-23 08:14:04 +0000 |
commit | 66394818227e7b420effbee00594c14b9e0d4688 (patch) | |
tree | 4633049e334d2b39216aeabe85cdc1d145a5eb17 /ACE/include | |
parent | d991ce22c313ce26bc86e52afa1298eb01dfe3f7 (diff) | |
download | ATCD-66394818227e7b420effbee00594c14b9e0d4688.tar.gz |
ChangeLogTag: Wed Feb 23 08:12:47 UTC 2011 Olli Savia <ops@iki.fi>
Diffstat (limited to 'ACE/include')
-rw-r--r-- | ACE/include/makeinclude/platform_freebsd.GNU | 47 | ||||
-rw-r--r-- | ACE/include/makeinclude/platform_openbsd.GNU | 49 |
2 files changed, 57 insertions, 39 deletions
diff --git a/ACE/include/makeinclude/platform_freebsd.GNU b/ACE/include/makeinclude/platform_freebsd.GNU index 1cd8af28214..5c7b134e77a 100644 --- a/ACE/include/makeinclude/platform_freebsd.GNU +++ b/ACE/include/makeinclude/platform_freebsd.GNU @@ -8,26 +8,28 @@ ## flags for threads. OSVERSION := $(shell sysctl -n kern.osreldate) -versioned_so ?= 1 -threads ?= 1 debug ?= 1 optimize ?= 1 +threads ?= 1 +versioned_so ?= 1 CC = gcc CXX = g++ +AR = ar +ARFLAGS = ruv +CPPFLAGS += -I/usr/local/include DCFLAGS += -g DLD = $(CXX) LD = $(CXX) +LDFLAGS += -L/usr/local/lib OCFLAGS += -O2 PIC = -fpic -AR = ar -ARFLAGS = ruv +PRELIB = @true RANLIB = ranlib +SOFLAGS += -shared -SOFLAGS += -shared SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< -PRELIB = @echo ifeq ($(threads),1) LIBS += -lpthread @@ -35,24 +37,24 @@ else CPPFLAGS += -DACE_MT_SAFE=0 endif # threads -PLATFORM_XT_CPPFLAGS= -PLATFORM_XT_LIBS=-lXt -PLATFORM_XT_LDFLAGS= +PLATFORM_X11_CPPFLAGS = -I/usr/X11R6/include +PLATFORM_X11_LIBS = -lX11 +PLATFORM_X11_LDFLAGS = -L/usr/X11R6/lib -PLATFORM_FL_CPPFLAGS= -PLATFORM_FL_LIBS=-lfltk -lfltk_forms -lfltk_gl -PLATFORM_FL_LDFLAGS= +PLATFORM_XT_CPPFLAGS = +PLATFORM_XT_LIBS = -lXt +PLATFORM_XT_LDFLAGS = -PLATFORM_X11_CPPFLAGS=-I/usr/X11R6/include -PLATFORM_X11_LIBS=-lX11 -PLATFORM_X11_LDFLAGS=-L/usr/X11R6/lib +PLATFORM_FL_CPPFLAGS = +PLATFORM_FL_LIBS = -lfltk -lfltk_forms -lfltk_gl +PLATFORM_FL_LDFLAGS = -PLATFORM_GL_CPPFLAGS=-I/usr/X11R6/include -PLATFORM_GL_LIBS =-lGL -PLATFORM_GL_LDFLAGS =-L/usr/X11R6/lib +PLATFORM_GL_CPPFLAGS = -I/usr/X11R6/include +PLATFORM_GL_LIBS = -lGL +PLATFORM_GL_LDFLAGS = -L/usr/X11R6/lib -PLATFORM_GTK_CPPFLAGS=$(shell gtk-config --cflags) -PLATFORM_GTK_LIBS =$(shell gtk-config --libs) +PLATFORM_GTK_CPPFLAGS = $(shell gtk-config --cflags) +PLATFORM_GTK_LIBS = $(shell gtk-config --libs) PLATFORM_GTK_LDFLAGS = PLATFORM_FOX_CPPFLAGS ?= -I/usr/include/fox @@ -67,10 +69,7 @@ PLATFORM_TCL_CPPFLAGS=$(shell . /usr/local/lib/tcl8.*/tclConfig.sh && echo -n $$ PLATFORM_TCL_LIBS=$(shell . /usr/local/lib/tcl8.*/tclConfig.sh && echo -n $$TCL_LIB_FLAG) PLATFORM_TCL_LDFLAGS= -CPPFLAGS+=-I/usr/local/include -LDFLAGS+=-L/usr/local/lib - -# Test for template instantiation, add to SOFLAGS if SONAME set, +# Test for template instantiation, add to versioned_so if versioned_so set, # add -E to LDFLAGS if using GNU ld # include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU diff --git a/ACE/include/makeinclude/platform_openbsd.GNU b/ACE/include/makeinclude/platform_openbsd.GNU index 8f9592bb5c2..b660eb36f60 100644 --- a/ACE/include/makeinclude/platform_openbsd.GNU +++ b/ACE/include/makeinclude/platform_openbsd.GNU @@ -3,35 +3,57 @@ # platform_openbsd.GNU -versioned_so ?= 1 debug ?= 1 optimize ?= 1 threads ?= 1 +versioned_so ?= 1 CC = gcc -CXX = g++ +CXX = g++ +AR = ar +ARFLAGS = ruv +CPPFLAGS += -I/usr/local/include DCFLAGS += -g DLD = $(CXX) -LD = $(CXX) +LD = $(CXX) +LDFLAGS += -L/usr/local/lib OCFLAGS += -O2 PIC = -fpic -AR = ar -ARFLAGS = ruv +PRELIB = @true RANLIB = ranlib +SOFLAGS += -shared -SOFLAGS += -shared -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< -PRELIB = @echo +SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $< ifeq ($(threads),1) LDFLAGS += -pthread CPPFLAGS += -D_THREAD_SAFE -DACE_HAS_THREADS endif # threads -PLATFORM_X11_CPPFLAGS=-I/usr/X11R6/include -PLATFORM_X11_LIBS=-lX11 -PLATFORM_X11_LDFLAGS=-L/usr/X11R6/lib +PLATFORM_X11_CPPFLAGS = -I/usr/X11R6/include +PLATFORM_X11_LIBS = -lX11 +PLATFORM_X11_LDFLAGS = -L/usr/X11R6/lib + +PLATFORM_XT_CPPFLAGS = +PLATFORM_XT_LIBS = -lXt +PLATFORM_XT_LDFLAGS = + +PLATFORM_FL_CPPFLAGS = +PLATFORM_FL_LIBS = -lfltk -lfltk_forms -lfltk_gl +PLATFORM_FL_LDFLAGS = + +PLATFORM_GL_CPPFLAGS = -I/usr/X11R6/include +PLATFORM_GL_LIBS = -lGL +PLATFORM_GL_LDFLAGS = -L/usr/X11R6/lib + +PLATFORM_GTK_CPPFLAGS = $(shell gtk-config --cflags) +PLATFORM_GTK_LIBS = $(shell gtk-config --libs) +PLATFORM_GTK_LDFLAGS = + +PLATFORM_FOX_CPPFLAGS ?= -I/usr/include/fox +PLATFORM_FOX_LIBS ?= -lFOX +PLATFORM_FOX_LDFLAGS ?= PLATFORM_TK_CPPFLAGS=$(shell . /usr/local/lib/tk*/tkConfig.sh && echo -n $$TK_INCLUDE_SPEC) $(PLATFORM_X11_CPPFLAGS) PLATFORM_TK_LIBS=$(shell . /usr/local/lib/tk*/tkConfig.sh && echo -n $$TK_LIB_FLAG) $(PLATFORM_X11_LIBS) @@ -41,10 +63,7 @@ PLATFORM_TCL_CPPFLAGS=$(shell . /usr/local/lib/tcl*/tclConfig.sh && echo -n $$TC PLATFORM_TCL_LIBS=$(shell . /usr/local/lib/tcl*/tclConfig.sh && echo -n $$TCL_LIB_FLAG) PLATFORM_TCL_LDFLAGS= -CPPFLAGS+=-I/usr/local/include -LDFLAGS+=-L/usr/local/lib - -# Test for template instantiation, add to SOFLAGS if versioned_so set, +# Test for template instantiation, add to versioned_so if versioned_so set, # add -E to LDFLAGS if using GNU ld # include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU |