From 986a4e78ce5461dc0ada66169bb9111fb0346c46 Mon Sep 17 00:00:00 2001
From: Manuel Traut <manut@mecka.net>
Date: Thu, 7 Jun 2012 13:52:08 +0200
Subject: cleanup project structure

move some subprojects
fixup makefiles

Signed-off-by: Manuel Traut <manut@mecka.net>
---
 generic_gpio/Makefile         | 36 ----------------------------------
 generic_gpio/generic_gpio.cpp | 45 -------------------------------------------
 generic_gpio/run.sh           |  9 ---------
 3 files changed, 90 deletions(-)
 delete mode 100644 generic_gpio/Makefile
 delete mode 100644 generic_gpio/generic_gpio.cpp
 delete mode 100755 generic_gpio/run.sh

(limited to 'generic_gpio')

diff --git a/generic_gpio/Makefile b/generic_gpio/Makefile
deleted file mode 100644
index 954034d..0000000
--- a/generic_gpio/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-CC := $(CROSS_COMPILE)gcc
-CXX := $(CROSS_COMPILE)g++
-LD := $(CROSS_COMPILE)g++
-
-DISTRIO_COMMON := ../common
-DISTRIO_MANAGER := ../manager/lib
-DISTRIO_IO := ../io
-
-LDFLAGS += -L$(DISTRIO_COMMON) -ldistrio_common \
-	-L$(DISTRIO_IO) -ldistrio_io \
-	-L$(DISTRIO_MANAGER) -ldistrio_manager \
-	-lACE -lTAO -lTAO_AnyTypeCode -lTAO_CosNaming -lTAO_PortableServer
-CFLAGS += -fPIC -I$(DISTRIO_COMMON) -I$(DISTRIO_IO) -I$(DISTRIO_MANAGER)
-CXXFLAGS += $(CFLAGS)
-
-DESTDIR := /usr
-
-COMPONENT = distrio_generic_gpio
-EXEC = $(COMPONENT)
-OBJ = generic_gpio.o
-
-all: $(OBJ)
-	$(LD) $(LDFLAGS) -o $(EXEC) $(OBJ)
-
-clean:
-	rm -f *.o
-	rm -f $(EXEC)
-
-install: all
-	cp -a $(EXEC) $(DESTDIR)/bin
-
-uninstall:
-	rm -f $(DESTDIR)/bin/$(EXEC)
-
-idl:
-	/bin/true
diff --git a/generic_gpio/generic_gpio.cpp b/generic_gpio/generic_gpio.cpp
deleted file mode 100644
index 325cb9c..0000000
--- a/generic_gpio/generic_gpio.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include <distrio_helper.h>
-#include <distrio_error.h>
-
-#include <distrio_ioI.h>
-
-#include <iostream>
-
-class My_digital : public Distrio_Digital_i {
-	public:
-		::CORBA::Long id (void)
-		{
-			return my_id;
-		}
-		void id (::CORBA::Long id)
-		{
-			my_id = id;
-		}
-	private:
-		::CORBA::Long my_id;
-};
-
-int main (int argc, char **argv)
-{
-	int ret = 0;
-	My_digital *digital;
-
-	if (init_corba (argc, argv))
-		return -EINVAL;
-
-	if (run_orb ())
-		return -EINVAL;
-
-	digital = new My_digital ();
-
-	if (register_digital ("pin huhu", digital)) {
-		ret = -EINVAL;
-		goto out;
-	}
-
-	std::cout << "registered id: " << digital->id () << std::endl;
-
-out:
-	free (digital);
-	return ret;
-}
diff --git a/generic_gpio/run.sh b/generic_gpio/run.sh
deleted file mode 100755
index ab1068f..0000000
--- a/generic_gpio/run.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-#
-# startup script for distrio generic gpio exporter
-#
-# author: Manuel Traut <manut@mecka.net>
-
-LD_LIBRARY_PATH=../io:../common:../manager/lib ./distrio_generic_gpio \
-	-ORBInitRef NameService=corbaloc:iiop:localhost:12345/NameService \
-	$@
-- 
cgit v1.2.3