diff options
| author | Olli Savia <ops@iki.fi> | 2006-01-16 14:37:38 +0000 |
|---|---|---|
| committer | Olli Savia <ops@iki.fi> | 2006-01-16 14:37:38 +0000 |
| commit | bb65e0cc08d932e33823fff77f5a40eed6ec3c72 (patch) | |
| tree | b8d43615239659f1bf79b89b5c12c945b6870fc3 /include | |
| parent | 236c942f61120691fa80552b3b81b910478bfb4b (diff) | |
| download | ATCD-bb65e0cc08d932e33823fff77f5a40eed6ec3c72.tar.gz | |
ChangeLogTag: Mon Jan 16 14:35:10 UTC 2006 Olli Savia <ops@iki.fi>
Diffstat (limited to 'include')
| -rw-r--r-- | include/makeinclude/platform_lynxos.GNU | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/include/makeinclude/platform_lynxos.GNU b/include/makeinclude/platform_lynxos.GNU index 375ee16063e..28e735cbea6 100644 --- a/include/makeinclude/platform_lynxos.GNU +++ b/include/makeinclude/platform_lynxos.GNU @@ -67,10 +67,11 @@ endif # ! LynxOS LYNXOS_MAJOR = $(shell echo $(VERSION) | awk -F. '{print $$1;}') LYNXOS_MINOR = $(shell echo $(VERSION) | awk -F. '{print $$2;}') -# LynxOS 3.x does not support shared libraries +# LynxOS 3.x does not support shared libraries or native exceptions ifeq ($(LYNXOS_MAJOR),3) shared_libs_only = static_libs_only = 1 + exceptions = 0 endif ifeq ($(shared_libs_only),1) @@ -96,22 +97,25 @@ PLATFORM_X11_CPPFLAGS= PLATFORM_X11_LIBS=-lXpm -lXext -lX11 -lSM -lICE PLATFORM_X11_LDFLAGS= -ifeq ($(LYNXOS_MAJOR),4) - PLATFORM_TCL_CPPFLAGS=-I/usr/include/tcl8.4 - PLATFORM_TCL_LIBS=-ltcl8.4 - PLATFORM_TCL_LDFLAGS= +PLATFORM_TCL_CPPFLAGS= +PLATFORM_TCL_LIBS= +PLATFORM_TCL_LDFLAGS= - PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS) - PLATFORM_TK_LIBS=$(shell . /usr/lib/tk8.4/tkConfig.sh && echo -n $$TK_LIB_FLAG) - PLATFORM_TK_LDFLAGS= -endif +PLATFORM_TK_CPPFLAGS= +PLATFORM_TK_LIBS= +PLATFORM_TK_LDFLAGS= ifeq ($(threads),1) - CFLAGS += -mthreads + CFLAGS += -mthreads + SOFLAGS += -mthreads endif ifeq ($(shared_libs),1) - CFLAGS += -mshared + CFLAGS += -mshared -DACE_HAS_SVR4_DYNAMIC_LINKING + SOFLAGS += -mshared -DACE_HAS_SVR4_DYNAMIC_LINKING + LIBS += -ldl +else + LIBS += -lnetinet -lnsl endif CC = gcc @@ -122,7 +126,6 @@ DCFLAGS += -g PIC = -fPIC DLD = $(CXX) LD = $(CXX) -LIBS += -lnetinet -lnsl OCFLAGS += -O2 AR = ar ARFLAGS = ruv |