# HG changeset patch # User greg # Date 1210167348 -7200 # Node ID 48cd190df6f7157e162a866b674c2907f6a40abf # Parent ddd1a31b7960149725ef26c2e8779a6e5ad19bc9 clean Makefile.in diff -r ddd1a31b7960 -r 48cd190df6f7 drivers/can_vscom/Makefile.in --- a/drivers/can_vscom/Makefile.in Wed May 07 14:46:06 2008 +0200 +++ b/drivers/can_vscom/Makefile.in Wed May 07 15:35:48 2008 +0200 @@ -33,14 +33,12 @@ CAN_DLL_CFLAGS=SUB_CAN_DLL_CFLAGS -L. # define target specific environment -ifeq ($(TARGET),win32) +ifeq ($(OS),CYGWIN) DLL_TYPE=dll -CAN_MINGW_DLL_FLAGS= -CAN_LINUX_DLL_FLAGS= +CAN_VSCOM_DLL_FLAGS=-Wl,--export-all-symbols -Wl,--exclude-libs,ALL else DLL_TYPE=so -CAN_MINGW_DLL_FLAGS= -CAN_LINUX_DLL_FLAGS=-Wl,-soname,libcanfestival_$(CAN_DRIVER).so +CAN_VSCOM_DLL_FLAGS=-Wl,-soname,libcanfestival_$(CAN_DRIVER).so endif INCLUDES = -I../../include -I../../include/$(TARGET) -I../../include/$(CAN_DRIVER) @@ -62,6 +60,7 @@ wget http://www.vscom.de/download/multiio/linux/driver/VSCAN_API_1_0.zip @if which unzip &> /dev/null; then \ unzip VSCAN_API_1_0.zip; \ + chmod +x vs_can_api.dll; \ else \ echo "No unzip found. Please decompress VSCAN_API_1_0.zip manually"; \ exit 1; \ @@ -73,7 +72,7 @@ $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< libcanfestival_$(CAN_DRIVER).$(DLL_TYPE): $(OBJS) - $(CC) -shared $(CAN_LINUX_DLL_FLAGS) $(CAN_MINGW_DLL_FLAGS) -o $@ $< $(CAN_DLL_CFLAGS) + $(CC) -shared $(CAN_VSCOM_DLL_FLAGS) -o $@ $< $(CAN_DLL_CFLAGS) install: libcanfestival_$(CAN_DRIVER).so mkdir -p $(PREFIX)/lib/