change the component library so that we can include different

kind of components



git-svn-id: https://tecsw.estec.esa.int/svn/taste/trunk/ocarina@734 129961e7-ef38-4bb5-a8f7-c9a525a55882

resources/AADLv2/components/processors.aadl

+package ocarina_processors
+
+public
+
+processor native
+end native;
+
+
+end ocarina_processors;

resources/AADLv2/components/processors/native.aadl

+package ocarina_processors_native
+
+public
+
+processor native
+end native;
+
+end ocarina_processors_native;

resources/Makefile.am

@@ -27,14 +27,9 @@ AADL_V2_PROPERTIES = $(srcdir)/AADLv2/aadl_project.aadl \
 	$(srcdir)/AADLv2/base_types.aadl \
 	$(srcdir)/AADLv2/transformations.aadl
 
-AADL_V2_DRIVERS = $(srcdir)/AADLv2/drivers/devices.aadl \
-                  $(srcdir)/AADLv2/drivers/serial-raw.aadl \
-                  $(srcdir)/AADLv2/drivers/buses.aadl \
-                  $(srcdir)/AADLv2/drivers/sockets-raw.aadl \
-                  $(srcdir)/AADLv2/drivers/sockets-asn1.aadl \
-                  $(srcdir)/AADLv2/drivers/rasta-serial.aadl \
-                  $(srcdir)/AADLv2/drivers/rasta-spacewire.aadl \
-                  $(srcdir)/AADLv2/drivers/rasta-1553.aadl
+AADL_V2_COMPONENTS = $(srcdir)/AADLv2/components/*.aadl \
+                     $(srcdir)/AADLv2/components/devices/*.aadl \
+                     $(srcdir)/AADLv2/components/processors/*.aadl
 
 
 MODE_FILES = $(srcdir)/emacs/aadl-mode.el \
@@ -44,6 +39,7 @@ MODE_FILES = $(srcdir)/emacs/aadl-mode.el \
 EXTRA_DIST = $(AADL_COMMON_PROPERTIES) \
 	$(AADL_V1_PROPERTIES) \
 	$(AADL_V2_PROPERTIES) \
+	$(AADL_V2_COMPONENTS) \
 	$(MODE_FILES)
 
 install-data-local:
@@ -54,14 +50,20 @@ install-data-local:
 	  $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/ocarina/AADLv1 || exit 1; \
 	  $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/ocarina/AADLv2 || exit 1; \
 	done
+	for file in $(AADL_V2_PROPERTIES); do \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/ocarina/AADLv2 || exit 1; \
+	done
 	for file in $(AADL_V1_PROPERTIES); do \
 	  $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/ocarina/AADLv1 || exit 1; \
 	done
-	for file in $(AADL_V2_DRIVERS); do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/ocarina/AADLv2/driver-`basename $$file` || exit 1; \
+	for file in ./AADLv2/components/*.aadl; do \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/ocarina/AADLv2/`basename $$file` || exit 1; \
 	done
-	for file in $(AADL_V2_PROPERTIES); do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/ocarina/AADLv2 || exit 1; \
+	for file in $(srcdir)/AADLv2/components/devices/*.aadl; do \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/ocarina/AADLv2/device-`basename $$file` || exit 1; \
+	done
+	for file in $(srcdir)/AADLv2/components/processors/*.aadl; do \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/ocarina/AADLv2/processor-`basename $$file` || exit 1; \
 	done
 	for file in $(MODE_FILES); do \
 	  $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/ocarina || exit 1; \