incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1400130 - /incubator/ooo/trunk/main/solenv/inc/target.mk
Date Fri, 19 Oct 2012 15:21:43 GMT
Author: hdu
Date: Fri Oct 19 15:21:42 2012
New Revision: 1400130

URL: http://svn.apache.org/viewvc?rev=1400130&view=rev
Log:
allow building an unchanged binfilter after changes to common header files

Cleanups in header files can result in finding or avoiding errors,
but the binfilter module as a legacy module should not be changed to
adjust for such cleanups.

In order to allow that the binfilter module can stay unaffected
by such changes the compiler macro BINFILTER_COMPAT has been added
to allow cleanups without disturbing binfilter.

When the flag is active header files are compatible to binfilter assumptions.
The flag is for now only active when compiling the binfilter module.

Having a grepable define allows further cleanups when the binfilter
module has been removed for good in a future release.

Modified:
    incubator/ooo/trunk/main/solenv/inc/target.mk

Modified: incubator/ooo/trunk/main/solenv/inc/target.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/target.mk?rev=1400130&r1=1400129&r2=1400130&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/target.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/target.mk Fri Oct 19 15:21:42 2012
@@ -27,6 +27,14 @@ MKFILENAME:=TARGET.MK
 # INCLUDE-Path
 # ------------------------------------------------------------------
 
+.IF "$(TARGET)"==""
+target_empty=warn_target_empty
+.ENDIF
+
+.IF "$(PRJNAME)" == "binfilter"
+CDEFS+=-DBINFILTER_COMPAT
+.ENDIF
+
 .IF "$(STL_OS2_BUILDING)" != ""
 CDEFS+=-DSTL_OS2_BUILDING
 .ENDIF
@@ -40,10 +48,6 @@ CFLAGS += -xldscope=hidden
 .ENDIF
 .ENDIF
 
-.IF "$(TARGET)"==""
-target_empty=warn_target_empty
-.ENDIF
-
 # all use solarinc
 # no standalone -I flags!!
 INCEXT*=.
@@ -63,6 +67,7 @@ INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/)
 .ENDIF		# "$(PRJINC)"!=""
 INCLUDE_C=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
 .EXPORT : LIB
+
 # --- Compiler -----------------------------------------------------
 
 .IF "$(RC_SUBDIRS)"!=""



Mime
View raw message