diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-08-18 18:43:56 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-08-18 18:43:56 +0200 |
| commit | 7dae37fcbda8dd8160716072bb251c43d6c46f31 (patch) | |
| tree | d62e9d1e92f22b3fb72bda5b1b481d03b1d91e00 /cppuhelper | |
| parent | 4e7393d525db4eb05ef880426cf460104a398a1a (diff) | |
Split build: Revert it for now.
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/makefile.mk | 2 | ||||
| -rw-r--r-- | cppuhelper/unotypes/makefile.mk | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cppuhelper/source/makefile.mk b/cppuhelper/source/makefile.mk index 84c7710d2..17dad41fa 100644 --- a/cppuhelper/source/makefile.mk +++ b/cppuhelper/source/makefile.mk @@ -51,7 +51,7 @@ UNIXVERSIONNAMES=UDK # --- Files -------------------------------------------------------- -UNOUCRRDB=$(BUILDSOLARBINDIR)$/udkapi.rdb +UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb UNOUCRDEP=$(UNOUCRRDB) UNOUCROUT=$(OUT)$/inc$/$(TARGET) INCPRE+=$(OUT)$/inc$/$(TARGET) $(OUT)$/inc$/private diff --git a/cppuhelper/unotypes/makefile.mk b/cppuhelper/unotypes/makefile.mk index ce34e0da1..c2c835d9e 100644 --- a/cppuhelper/unotypes/makefile.mk +++ b/cppuhelper/unotypes/makefile.mk @@ -40,7 +40,7 @@ UNOUCRRDB = $(BIN)$/$(TARGET).rdb UNOUCRDEP = $(UNOUCRRDB) UNOUCROUT = $(OUT)$/inc$/private -CPPUMAKERFLAGS += -C -X$(BUILDSOLARBINDIR)$/types.rdb +CPPUMAKERFLAGS += -C -X$(SOLARBINDIR)$/types.rdb UNOTYPES = \ cppuhelper.detail.XExceptionThrower @@ -50,7 +50,7 @@ ALLIDLFILES = \ .INCLUDE : target.mk -$(UNOUCRRDB) : $(ALLIDLFILES) $(BUILDSOLARBINDIR)$/types.rdb - $(IDLC) -I. -I$(BUILDSOLARIDLDIR) -O$(UCR) $(ALLIDLFILES) +$(UNOUCRRDB) : $(ALLIDLFILES) $(SOLARBINDIR)$/types.rdb + $(IDLC) -I. -I$(SOLARIDLDIR) -O$(UCR) $(ALLIDLFILES) $(REGMERGE) $@ /UCR $(UCR)$/{$(?:f:s/.idl/.urd/)} touch $@ |