From 73b9953a60b7d25e9f26ca221c131ff5e53776e4 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Mon, 18 Jan 2010 17:54:26 +0100 Subject: [PATCH] also install includes --- CASA/include/CMakeLists.txt | 27 ++++++++ CASA/micasad/startup/Makefile.am | 108 ------------------------------- 2 files changed, 27 insertions(+), 108 deletions(-) create mode 100644 CASA/include/CMakeLists.txt delete mode 100644 CASA/micasad/startup/Makefile.am diff --git a/CASA/include/CMakeLists.txt b/CASA/include/CMakeLists.txt new file mode 100644 index 00000000..6d0dbfeb --- /dev/null +++ b/CASA/include/CMakeLists.txt @@ -0,0 +1,27 @@ +################################# +# Project +############## + +project(casa-include) + +################################# +# Dependencies +############## + +################################# +# Compiler Switches +############## + +################################# +# Source Files +############## + +################################# +# Linking +############## + +################################# +# Install Files +############## + +install(FILES micasa_mgmd.h micasa_types.h sscs_string.h sscs_utf8.h micasa.h casa_status.h DESTINATION ${INCLUDE_INSTALL_DIR}) diff --git a/CASA/micasad/startup/Makefile.am b/CASA/micasad/startup/Makefile.am deleted file mode 100644 index d21291ad..00000000 --- a/CASA/micasad/startup/Makefile.am +++ /dev/null @@ -1,108 +0,0 @@ -####################################################################### -# -# Copyright (C) 2006 Novell, Inc. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free -# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# -####################################################################### - -if DEBUG -TARGET_CFG = Debug -CFLAGS += -v -w -else -TARGET_CFG = Release -endif - -SUBDIRS = -DIST_SUBDIRS = - -EXTRA_DIST = $(CFILES) *.sh *casa* - -CASAROOT = ../.. - -CASALIBDIR = $(CASAROOT)/$(LIB) - -if LIB64 -CASABINDIR = $(CASAROOT)/bin64 -else -CASABINDIR = $(CASAROOT)/bin -endif - -# handle Mono secondary dependencies -export MONO_PATH := $(MONO_PATH) - -PLATFORMINDEPENDENTSOURCEDIR = .. -PLATFORMDEPENDENTSOURCEDIR = . - -MODULE_NAME =micasad-init -MODULE_EXT = - -CFILES = micasad-init.c - -CSFILES_CSC := -EXTRA_CFLAGS = -RESOURCES = -OBJDIR = ./$(TARGET_CFG)/$(LIB) - -#OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o)) -OBJS = micasad-init - -CUR_DIR := $(shell pwd) - -all: $(OBJDIR)/$(MODULE_NAME) - -# -# Pattern based rules. -# -vpath %.c $(PLATFORMDEPENDENTSOURCEDIR) $(PLATFORMINDEPENDENTSOURCEDIR) -vpath %.cpp $(PLATFORMDEPENDENTSOURCEDIR) $(PLATFORMINDEPENDENTSOURCEDIR) - -$(OBJS): - @echo [======== Compiling $@ ========] - @echo [======== OBJDIR $(OBJDIR) ========] - $(CC) -o $@ $(CFILES) - -$(OBJDIR)/$(MODULE_NAME): $(OBJDIR) $(OBJS) - cp -f $(OBJS) $(OBJDIR)/$(MODULE_NAME) - cp -f $(OBJDIR)/$(MODULE_NAME) $(CASABINDIR)/$(TARGET_CFG)/$(MODULE_NAME) - -$(OBJDIR): - [ -d $(OBJDIR) ] || mkdir -p $(OBJDIR) - [ -d $(CASABINDIR) ] || mkdir -p $(CASABINDIR) - [ -d $(CASABINDIR)/$(TARGET_CFG) ] || mkdir -p $(CASABINDIR)/$(TARGET_CFG) - - -install-exec-local: $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) - $(mkinstalldirs) $(DESTDIR)$(libdir) - $(INSTALL_PROGRAM) $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) $(DESTDIR)$(libdir)/ - -uninstall-local: - cd $(DESTDIR)$(libdir); rm -f $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) - rmdir $(DESTDIR)$(libdir) - -#installcheck-local: install -# $(mkinstalldirs) $(DESTDIR)$(libdir) -# $(INSTALL_PROGRAM) $(DESTDIR)$(libdir) -# cd $(DESTDIR)$(libdir); $(MONO) - -clean-local: - if [ -d $(TARGET_CFG) ]; then rm -rf $(TARGET_CFG); fi - -distclean-local: - -maintainer-clean-local: - rm -f Makefile.in -