- cp -u is not a valid cp option

- g++ is not a real C compiler - C does not support overloaded functions - g++ is not the system-configured C++ compiler git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12685 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Aug 27, 2012 · 07c2bff · 07c2bff
1 parent 3052323
commit 07c2bff
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/SimulationRuntime/ParModelica/OpenCLRuntime/Makefile.common b/SimulationRuntime/ParModelica/OpenCLRuntime/Makefile.common
@@ -4,13 +4,9 @@ OPENMODELICA_INC=$(TOP_BUILDDIR)/include/omc/
 OPENMODELICA_LIB=$(TOP_BUILDDIR)/lib/omc/
 OPENMODELICA_BIN=$(TOP_BUILDDIR)/bin/
 
-
+# cp -u is a GNU extension. Do not rely on it.
+COPY=cp -rp
 AR_=ar -rcs
-COPY=cp -rpu
-CC=g++
-CXX=g++
-
-CFLAGS= -fPIC -O3 -Wall -I. -I"../../c"
 
 SRCS = \
 omc_ocl_memory_ops.c \
@@ -30,4 +26,4 @@ libOMOCLRuntime.a: $(OBJS)
 	$(AR_) $@ $(OBJS)
 
 clean :
-	rm -f *.o *.a
+	rm -f *.o *.a
diff --git a/...untime/ParModelica/OpenCLRuntime/Makefile → ...ime/ParModelica/OpenCLRuntime/Makefile.in b/...untime/ParModelica/OpenCLRuntime/Makefile → ...ime/ParModelica/OpenCLRuntime/Makefile.in
@@ -1,10 +1,13 @@
+CC=@CC@
+CXX=@CXX@
 
+CFLAGS=@CFLAGS@
+CPPFLAGS=@CPPFLAGS@ -I. -I"../../c"
 
 EXEEXT=
 DLLEXT=.so
 OPENLC_LIB= lOpenCL
 
-
 all: transfer
 
 transfer: libOMOCLRuntime.a
@@ -15,6 +18,7 @@ transfer: libOMOCLRuntime.a
 	$(COPY) ParModelicaBuiltin.mo $(OPENMODELICA_LIB)
 	$(COPY) OCLRuntimeUtil_new.cl $(TOP_BUILDDIR)/include/omc/
 
-include Makefile.common
+Makefile: Makefile.in
+	(cd ../../../ && ./config.status)
 
-	
+include Makefile.common
diff --git a/...a/OpenCLRuntime/omc_ocl_builtin_kernels.c → ...OpenCLRuntime/omc_ocl_builtin_kernels.cpp b/...a/OpenCLRuntime/omc_ocl_builtin_kernels.c → ...OpenCLRuntime/omc_ocl_builtin_kernels.cpp
diff --git a/...odelica/OpenCLRuntime/omc_ocl_interface.c → ...elica/OpenCLRuntime/omc_ocl_interface.cpp b/...odelica/OpenCLRuntime/omc_ocl_interface.c → ...elica/OpenCLRuntime/omc_ocl_interface.cpp
diff --git a/...delica/OpenCLRuntime/omc_ocl_memory_ops.c → ...lica/OpenCLRuntime/omc_ocl_memory_ops.cpp b/...delica/OpenCLRuntime/omc_ocl_memory_ops.c → ...lica/OpenCLRuntime/omc_ocl_memory_ops.cpp
diff --git a/.../ParModelica/OpenCLRuntime/omc_ocl_util.c → ...arModelica/OpenCLRuntime/omc_ocl_util.cpp b/.../ParModelica/OpenCLRuntime/omc_ocl_util.c → ...arModelica/OpenCLRuntime/omc_ocl_util.cpp
diff --git a/configure.in b/configure.in
@@ -649,6 +649,7 @@ SimulationRuntime/fmi/import/Makefile \
 SimulationRuntime/c/Makefile \
 SimulationRuntime/c/ModelicaExternalC/Makefile \
 SimulationRuntime/c/simulation/libf2c/makefile.u \
+SimulationRuntime/ParModelica/OpenCLRuntime/Makefile \
 SimulationRuntime/interactive/Makefile \
 mosh/src/Makefile \
 "