Menu
▾
▴
[Eas-dev-commit]eas-dev/components .cvsignore,1.5,1.6 Makefile.am,1.8,1.9
|
From: Yurii R. <yr...@us...> - 2003-02-08 08:23:50
|
Update of /cvsroot/eas-dev/eas-dev/components In directory sc8-pr-cvs1:/tmp/cvs-serv23957/components Modified Files: .cvsignore Makefile.am Log Message: Improved openeas.rdb building (w/ site common.rdb); some minor additions to `logger' components; misc changes at the rest Index: .cvsignore =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/components/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- .cvsignore 3 Feb 2003 06:30:45 -0000 1.5 +++ .cvsignore 8 Feb 2003 08:23:46 -0000 1.6 @@ -1,6 +1,4 @@ Makefile Makefile.in -openeas-basic.bin -openeas-basic.rdb openeas.rdb .include Index: Makefile.am =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/components/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile.am 4 Feb 2003 07:52:25 -0000 1.8 +++ Makefile.am 8 Feb 2003 08:23:47 -0000 1.9 @@ -2,144 +2,25 @@ ODK = @ODK_PATH@ IDLC = @IDLC@ REGMERGE = @REGMERGE@ - +REGCOMP = @REGCOMP@ RM = @RM@ -IDL_PATH = $(ODK)/idl -BIN_PATH = .openeas.urd - -BASIC_IDLS = com/sun/star/uno/Exception.idl \ -com/sun/star/uno/NamingService.idl \ -com/sun/star/uno/RuntimeException.idl \ -com/sun/star/uno/SecurityException.idl \ -com/sun/star/uno/TypeClass.idl \ -com/sun/star/uno/Uik.idl \ -com/sun/star/uno/XAdapter.idl \ -com/sun/star/uno/XAggregation.idl \ -com/sun/star/uno/XComponentContext.idl \ -com/sun/star/uno/XCurrentContext.idl \ -com/sun/star/uno/XFactory.idl \ -com/sun/star/uno/XInterface.idl \ -com/sun/star/uno/XNamingService.idl \ -com/sun/star/uno/XReference.idl \ -com/sun/star/uno/XUnloadingPreference.idl \ -com/sun/star/uno/XWeak.idl \ -com/sun/star/lang/ArrayIndexOutOfBoundsException.idl \ -com/sun/star/lang/ClassNotFoundException.idl \ -com/sun/star/lang/DisposedException.idl \ -com/sun/star/lang/EventObject.idl \ -com/sun/star/lang/IllegalAccessException.idl \ -com/sun/star/lang/IllegalArgumentException.idl \ -com/sun/star/lang/IndexOutOfBoundsException.idl \ -com/sun/star/lang/InvalidListenerException.idl \ -com/sun/star/lang/ListenerExistException.idl \ -com/sun/star/lang/Locale.idl \ -com/sun/star/lang/MultiServiceFactory.idl \ -com/sun/star/lang/NoSuchFieldException.idl \ -com/sun/star/lang/NoSuchMethodException.idl \ -com/sun/star/lang/NoSupportException.idl \ -com/sun/star/lang/NullPointerException.idl \ -com/sun/star/lang/RegistryServiceManager.idl \ -com/sun/star/lang/SecurityException.idl \ -com/sun/star/lang/ServiceManager.idl \ -com/sun/star/lang/ServiceNotRegisteredException.idl \ -com/sun/star/lang/SystemDependent.idl \ -com/sun/star/lang/WrappedTargetException.idl \ -com/sun/star/lang/WrappedTargetRuntimeException.idl \ -com/sun/star/lang/XComponent.idl \ -com/sun/star/lang/XConnectionPointContainer.idl \ -com/sun/star/lang/XConnectionPoint.idl \ -com/sun/star/lang/XEventListener.idl \ -com/sun/star/lang/XInitialization.idl \ -com/sun/star/lang/XLocalizable.idl \ -com/sun/star/lang/XMain.idl \ -com/sun/star/lang/XMultiComponentFactory.idl \ -com/sun/star/lang/XMultiServiceFactory.idl \ -com/sun/star/lang/XServiceDisplayName.idl \ -com/sun/star/lang/XServiceInfo.idl \ -com/sun/star/lang/XServiceName.idl \ -com/sun/star/lang/XSingleComponentFactory.idl \ -com/sun/star/lang/XSingleServiceFactory.idl \ -com/sun/star/lang/XTypeProvider.idl \ -com/sun/star/lang/XUnoTunnel.idl \ -com/sun/star/loader/CannotActivateFactoryException.idl \ -com/sun/star/loader/Dynamic.idl \ -com/sun/star/loader/Java.idl \ -com/sun/star/loader/SharedLibrary.idl \ -com/sun/star/loader/XImplementationLoader.idl \ -com/sun/star/registry/CannotRegisterImplementationException.idl \ -com/sun/star/registry/DefaultRegistry.idl \ -com/sun/star/registry/ImplementationRegistration.idl \ -com/sun/star/registry/InvalidRegistryException.idl \ -com/sun/star/registry/InvalidValueException.idl \ -com/sun/star/registry/MergeConflictException.idl \ -com/sun/star/registry/NestedRegistry.idl \ -com/sun/star/registry/RegistryKeyType.idl \ -/com/sun/star/registry/RegistryValueType.idl \ -com/sun/star/registry/SimpleRegistry.idl \ -com/sun/star/registry/XImplementationRegistration.idl \ -com/sun/star/registry/XRegistryKey.idl \ -com/sun/star/registry/XSimpleRegistry.idl \ -com/sun/star/container/ContainerEvent.idl \ -com/sun/star/container/ElementExistException.idl \ -com/sun/star/container/NoSuchElementException.idl \ -com/sun/star/container/XChild.idl \ -com/sun/star/container/XComponentEnumerationAccess.idl \ -com/sun/star/container/XComponentEnumeration.idl \ -com/sun/star/container/XContainer.idl \ -com/sun/star/container/XContainerListener.idl \ -com/sun/star/container/XContentEnumerationAccess.idl \ -com/sun/star/container/XElementAccess.idl \ -com/sun/star/container/XEnumerationAccess.idl \ -com/sun/star/container/XEnumeration.idl \ -com/sun/star/container/XHierarchicalNameAccess.idl \ -com/sun/star/container/XHierarchicalNameContainer.idl \ -com/sun/star/container/XHierarchicalName.idl \ -com/sun/star/container/XHierarchicalNameReplace.idl \ -com/sun/star/container/XIdentifierAccess.idl \ -com/sun/star/container/XIdentifierContainer.idl \ -com/sun/star/container/XIdentifierReplace.idl \ -com/sun/star/container/XImplicitIDAccess.idl \ -com/sun/star/container/XImplicitIDContainer.idl \ -com/sun/star/container/XImplicitIDReplace.idl \ -com/sun/star/container/XIndexAccess.idl \ -com/sun/star/container/XIndexContainer.idl \ -com/sun/star/container/XIndexReplace.idl \ -com/sun/star/container/XNameAccess.idl \ -com/sun/star/container/XNameContainer.idl \ -com/sun/star/container/XNamed.idl \ -com/sun/star/container/XNameReplace.idl \ -com/sun/star/container/XSet.idl \ -com/sun/star/container/XUniqueIDAccess.idl - -BASIC_IDLS_ = $(patsubst %.idl,$(IDL_PATH)/%.idl,$(BASIC_IDLS)) -BASIC_URDS = $(subst idl,urd,$(BASIC_IDLS)) -BASIC_URDS_ = $(patsubst %.urd,$(BIN_PATH)/%.urd,$(BASIC_URDS)) +SITE_RDB = openeas.rdb -COMPONENTS_REGISTRY=$(patsubst %,%/bin/%.rdb,$(COMPONENTS)) +COMPONENT_DLLS=$(foreach component, $(COMPONENTS), $(component)/src/.libs/lib$(component).so) -CLEANFILES = openeas.rdb .openeas.rdb +CLEANFILES = openeas.rdb clean-local: - $(RM) -rf .include - $(RM) -rf $(BIN_PATH) + $(RM) -rf .incs -all-local: openeas.rdb +all-local: openeas.rdb -openeas.rdb: $(COMPONENTS_REGISTRY) - $(REGMERGE) openeas.rdb /UCR .openeas.rdb $(COMPONENTS_REGISTRY) +$(SITE_RDB): $(COMPONENT_DLLS) + $(REGCOMP) -register -r $(SITE_RDB) $(patsubst %,-c %,$(COMPONENT_DLLS)) -$(COMPONENTS_REGISTRY): .openeas.rdb +$(COMPONENT_DLLS): $(patsubst %,%/Makefile,$(COMPONENTS)) for dir in $(COMPONENTS); do \ $(MAKE) -C $$dir; \ done - -.openeas.rdb: $(BASIC_URDS_) - $(REGMERGE) .openeas.rdb /UCR $(BASIC_URDS_) - -$(BASIC_URDS_) : $(BASIC_IDLS_) - for idl in $(BASIC_IDLS); do \ - $(IDLC) -I$(ODK_PATH)/idl -I$(IDL_PATH) -O$(BIN_PATH)/`dirname $$idl` $(IDL_PATH)/$$idl; \ - done - |
