diff options
-rw-r--r-- | ACE/ChangeLog | 9 | ||||
-rw-r--r-- | ACE/debian/libace-xml-utils-6.1.6.install | 1 | ||||
-rw-r--r-- | ACE/debian/libace-xml-utils-dev.install | 3 | ||||
-rw-r--r-- | ACE/debian/platform_macros.GNU.in | 127 |
4 files changed, 13 insertions, 127 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 32ac1f93d09..d24c37bc5ab 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,12 @@ +Wed Nov 21 10:18:22 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * debian/libace-xml-utils-6.1.6.install: + * debian/libace-xml-utils-dev.install: + New files + + * debian/platform_macros.GNU.in: + Removed this file. + Tue Nov 20 23:55:57 UTC 2012 Steve Huston <shuston@riverace.com> * ace/config-hpux-11.00.h: diff --git a/ACE/debian/libace-xml-utils-6.1.6.install b/ACE/debian/libace-xml-utils-6.1.6.install new file mode 100644 index 00000000000..2428ec9f109 --- /dev/null +++ b/ACE/debian/libace-xml-utils-6.1.6.install @@ -0,0 +1 @@ +usr/lib/libACE_XML_Utils-*.so diff --git a/ACE/debian/libace-xml-utils-dev.install b/ACE/debian/libace-xml-utils-dev.install new file mode 100644 index 00000000000..b1539d17224 --- /dev/null +++ b/ACE/debian/libace-xml-utils-dev.install @@ -0,0 +1,3 @@ +usr/lib/libACE_XML_Utils.so +usr/include/ace/XML_Utils/* +usr/lib/pkgconfig/ACE_XML_Utils.pc diff --git a/ACE/debian/platform_macros.GNU.in b/ACE/debian/platform_macros.GNU.in deleted file mode 100644 index 4ab8f0aac88..00000000000 --- a/ACE/debian/platform_macros.GNU.in +++ /dev/null @@ -1,127 +0,0 @@ -# -*- Makefile -*- -ifeq (@BUILD_EXCEPTIONS_TRUE@,) - exceptions ?= 1 -else - exceptions ?= 0 -endif - -ifneq ($(findstring -g,@CXXFLAGS@),) - debug ?= 1 -else - debug ?= 0 -endif - -ifneq ($(filter -O2 -O3,@CXXFLAGS@),) - optimize ?= 1 -else - optimize ?= 0 -endif - -ifneq ($(findstring -pthread,@CXXFLAGS@),) - threads ?= 1 -else - threads ?= 0 -endif - -insure ?= 0 - -PLATFORM_XT_CPPFLAGS = @ACE_XT_CPPFLAGS@ -PLATFORM_XT_LIBS = @ACE_XT_LIBS@ -PLATFORM_XT_LDFLAGS = @ACE_XT_LDFLAGS@ - -PLATFORM_FL_CPPFLAGS = @ACE_FLTK_CPPFLAGS@ -PLATFORM_FL_LIBS = @ACE_FLTK_LIBS@ - -PLATFORM_X11_CPPFLAGS = @ACE_X11_CPPFLAGS@ -PLATFORM_X11_LIBS = @ACE_X11_LIBS@ -PLATFORM_X11_LDFLAGS = @ACE_X11_LDFLAGS@ - -PLATFORM_FOX_CPPFLAGS = @ACE_FOX_CPPFLAGS@ -PLATFORM_FOX_LIBS = @ACE_FOX_LIBS@ - -PLATFORM_TCL_CPPFLAGS = @ACE_TCL_CPPFLAGS@ -PLATFORM_TCL_LIBS = @ACE_TCL_LIBS@ - -PLATFORM_TK_CPPFLAGS = @ACE_TK_CPPFLAGS@ -PLATFORM_TK_LIBS = @ACE_TK_LIBS@ - -PLATFORM_QT_CPPFLAGS = @ACE_QT_CPPFLAGS@ -PLATFORM_QT_LIBS = @ACE_QT_LIBS@ - -ifeq (@BUILD_SSL_TRUE@,) - ssl ?= 1 -else - ssl ?= 0 -endif - -ifeq ($(insure),1) - CC = insure - CXX = insure -endif - -PIC = -fPIC -AR ?= @AR@ -ARFLAGS = rsuv -RANLIB = @RANLIB@ - -ifeq ($(insure),0) - CC ?= @CC@ - CXX ?= @CXX@ - CXX_FOR_VERSION_TEST ?= $(CXX) -else - CXX_FOR_VERSION_TEST ?= @CXX@ -endif - -ifneq ($(findstring -pipe,@CXXFLAGS@),) - pipes ?= 1 -else - pipes ?= 0 -endif - -CXX_FULL_VERSION := $(shell $(CXX_FOR_VERSION_TEST) --version) - -FLAGS_C_CC += $(filter-out -g -O2 -O3 -pipe,@CXXFLAGS@) - -ifeq ($(buildbits),32) - FLAGS_C_CC += -m32 - LDFLAGS += -m32 -endif -ifeq ($(buildbits),64) - FLAGS_C_CC += -m64 -endif - -DCFLAGS += -g -DCCFLAGS += -g -DLD = $(CXX) -LD = $(CXX) -LIBS += @LIBS@ - -ifeq ($(optimize),1) - SOFLAGS += -Wl,-O2 -endif - -SOFLAGS += $(CPPFLAGS) -shared -SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<; \ - $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o -PRELIB = @true - -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -OCFLAGS ?= -O2 -OCCFLAGS ?= -O2 - -CFLAGS += $(FLAGS_C_CC) -CCFLAGS += $(FLAGS_C_CC) $(TEMPLATES_FLAG) - -# Added line below to support "Executable Shared Object" files (as -# needed by the service configurator). -# Marius Kjeldahl <mariusk@sn.no, marius@funcom.com> -ifeq ($(threads),1) - ESOBUILD = $(COMPILEESO.cc) $(PIC) -shared -o $(VSHDIR)$*.so $< - ifndef PRELIB - PRELIB = @true - endif # ! PRELIB -endif |