diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-04-11 12:55:28 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-04-11 14:24:08 +0200 |
| commit | b9d93c00306a10ef270f9979ed717a8c3cfb7414 (patch) | |
| tree | 4b55938ac10fbeee01ef9f43758fa5e9c87e7a4c /ure | |
| parent | c482ded5fd9be85b441d952b29793a2f38a76b67 (diff) | |
Adapt uretest to -B removed from cppumaker/javamaker
Change-Id: If256eeddf4b8efded6e5e010b0155e05f5a1de79
Diffstat (limited to 'ure')
| -rw-r--r-- | ure/source/uretest/Makefile | 6 | ||||
| -rw-r--r-- | ure/source/uretest/Makefile.pln | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/ure/source/uretest/Makefile b/ure/source/uretest/Makefile index 26a1a6f90bcd..1db5282d3a85 100644 --- a/ure/source/uretest/Makefile +++ b/ure/source/uretest/Makefile @@ -139,12 +139,12 @@ out.sdk/cppserver.$(OBJ_EXT): cppserver.cc out.sdk/cpputypes.cppumaker.flag \ out.sdk/cpputypes.cppumaker.flag: | out.sdk $(CPPUMAKER) -O./out.sdk/include/cpputypes \ - -BUCR "$(URE_TYPES)" "-Tcom.sun.star.lang.DisposedException;com.sun.star.lang.EventObject;com.sun.star.lang.XMain;com.sun.star.lang.XMultiComponentFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XTypeProvider;com.sun.star.registry.XRegistryKey;com.sun.star.uno.DeploymentException;com.sun.star.uno.Exception;com.sun.star.uno.RuntimeException;com.sun.star.uno.XAggregation;com.sun.star.uno.XComponentContext;com.sun.star.uno.XCurrentContext;com.sun.star.uno.XInterface;com.sun.star.uno.XWeak;com.sun.star.util.theMacroExpander" \ + "$(URE_TYPES)" touch $@ out.sdk/types.cppumaker.flag: out.sdk/types.rdb | out.sdk - $(CPPUMAKER) -O./out.sdk/include/types -BUCR $< "-X$(URE_TYPES)" + $(CPPUMAKER) -O./out.sdk/include/types $< "-X$(URE_TYPES)" touch $@ @@ -261,7 +261,7 @@ out.sdk/types.mf: types.mf.template | out.sdk out.sdk/types.javamaker.flag: out.sdk/types.rdb | out.sdk out.sdk/class - $(DELRECURSIVE) $(subst /,$(PS),out.sdk/class/types) - $(JAVAMAKER) -O./out.sdk/class/types -BUCR $< "-X$(URE_TYPES)" + $(JAVAMAKER) -O./out.sdk/class/types $< "-X$(URE_TYPES)" touch $@ diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln index 612e4904e088..ac11d2ac1e61 100644 --- a/ure/source/uretest/Makefile.pln +++ b/ure/source/uretest/Makefile.pln @@ -122,14 +122,13 @@ out.pln/cppserver.o: cppserver.cc out.pln/cpputypes.cppumaker.flag \ out.pln/cpputypes.cppumaker.flag: | out.pln LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/bin/cppumaker \ -O./out.pln/include/cpputypes \ - -BUCR $(URE_HOME)/share/misc/types.rdb '-Tcom.sun.star.lang.DisposedException;com.sun.star.lang.EventObject;com.sun.star.lang.XMain;com.sun.star.lang.XMultiComponentFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XTypeProvider;com.sun.star.registry.XRegistryKey;com.sun.star.uno.DeploymentException;com.sun.star.uno.Exception;com.sun.star.uno.RuntimeException;com.sun.star.uno.XAggregation;com.sun.star.uno.XComponentContext;com.sun.star.uno.XCurrentContext;com.sun.star.uno.XInterface;com.sun.star.uno.XWeak;com.sun.star.util.theMacroExpander' \ + $(URE_HOME)/share/misc/types.rdb touch $@ out.pln/types.cppumaker.flag: out.pln/types.rdb | out.pln LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/bin/cppumaker \ - -O./out.pln/include/types -BUCR $< \ - -X$(URE_HOME)/share/misc/types.rdb + -O./out.pln/include/types $< -X$(URE_HOME)/share/misc/types.rdb touch $@ @@ -246,7 +245,7 @@ out.pln/types.mf: types.mf.template | out.pln out.pln/types.javamaker.flag: out.pln/types.rdb | out.pln out.pln/class rm -rf out.pln/class/types LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/bin/javamaker \ - -O./out.pln/class/types -BUCR $< -X$(URE_HOME)/share/misc/types.rdb + -O./out.pln/class/types $< -X$(URE_HOME)/share/misc/types.rdb touch $@ |