diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-16 23:32:38 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-16 23:32:38 +0000 |
| commit | 4ae8159d57ecf9eaceff9f32697c073c45e4ab8f (patch) | |
| tree | 59311afd02578361d7080d4cd96c274fe8761ef3 /include | |
| parent | 952c73820927744653d671e1da27e4d6880a7ed0 (diff) | |
| download | ATCD-4ae8159d57ecf9eaceff9f32697c073c45e4ab8f.tar.gz | |
ChangeLogTag:Thu Nov 16 15:31:20 2000 Carlos O'Ryan <coryan@uci.edu>
Diffstat (limited to 'include')
| -rw-r--r-- | include/makeinclude/platform_linux.GNU | 4 | ||||
| -rw-r--r-- | include/makeinclude/platform_linux_kcc.GNU | 7 | ||||
| -rw-r--r-- | include/makeinclude/wrapper_macros.GNU | 14 |
3 files changed, 17 insertions, 8 deletions
diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU index 448732a1114..ddefa488eb9 100644 --- a/include/makeinclude/platform_linux.GNU +++ b/include/makeinclude/platform_linux.GNU @@ -38,6 +38,10 @@ 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_AIO_SUPPORT := \ $(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS) diff --git a/include/makeinclude/platform_linux_kcc.GNU b/include/makeinclude/platform_linux_kcc.GNU index 9bf4e090814..4ed59cdbe92 100644 --- a/include/makeinclude/platform_linux_kcc.GNU +++ b/include/makeinclude/platform_linux_kcc.GNU @@ -64,13 +64,6 @@ endif # binary generation. ifneq ($(static_libs),0) CCFLAGS += --one_instantiation_per_object - LD += -Bstatic - # If we must link with static libraries, libc must be linked in dynamically - # or else the executable will core dump. This is only necessary because the - # -Bstatic causes the hidden libraries (KCC, gcc and c) to get statically - # linked. You might get a big warning at link time. It's nothing with - # which to be concerned. - LIBS += -lc -Bstatic endif PIC = -fPIC diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU index fbf26e3d3bb..8c719a4bf85 100644 --- a/include/makeinclude/wrapper_macros.GNU +++ b/include/makeinclude/wrapper_macros.GNU @@ -44,6 +44,7 @@ # fl_reactor Build the FlReactor. # tk_reactor Build the TkReactor. # qt_reactor Build the QtReactor. +# gtk_reactor Build the GtkReactor. # ssl Build with OpenSSL support. # rapi Build with RAPI # split Build the library by first splitting up the ACE source to several @@ -371,6 +372,17 @@ ifneq ($(qt_reactor),) LDFLAGS += $(PLATFORM_QT_LDFLAGS) endif # qt_reactor +ifeq ($(gtk_reactor),0) + override gtk_reactor = +endif # gtk_reactor + +ifneq ($(gtk_reactor),) + override ace_with_gtk=1 + CPPFLAGS += -DACE_HAS_GTK $(PLATFORM_GTK_CPPFLAGS) + LIBS += $(PLATFORM_GTK_LIBS) + LDFLAGS += $(PLATFORM_GTK_LDFLAGS) +endif # gtk_reactor + ifeq ($(rapi),0) override rapi = endif #rapi @@ -603,7 +615,7 @@ ifdef repo #### Remove -fno-implicit-templates from, and add -frepo to, CCFLAGS. CCFLAGS := $(strip $(subst -fno-implicit-templates,,$(CCFLAGS))) CCFLAGS += -frepo -DACE_HAS_GNU_REPO - ace_lib_prelink := 1 +# ace_lib_prelink := 1 endif # repo |