Changeset 3393 for trunk

Timestamp:

Feb 28, 2013, 10:27:36 AM (12 years ago)

Author:

ldelgass

Message:

Makefile fixes for compiling C files (md5)

File:

• trunk/packages/vizservers/vtkvis/Makefile.in (modified) (5 diffs)

trunk/packages/vizservers/vtkvis/Makefile.in

@@ -98 +98 @@
 
 INCLUDES        = \
-                -I. \
                 -I$(srcdir) \
                 $(TCL_INC_SPEC) \
@@ -104 +103 @@
 
 #vtk uses deprecated strstream header (instead of sstream)
-EXTRA_CFLAGS    = -Wall -Wno-deprecated
+EXTRA_CXXFLAGS  = -Wall -Wno-deprecated
+EXTRA_CFLAGS    = -Wall
 DEFINES         =
 ifdef DEBUG
@@ -130 +130 @@
 endif
 
-CXX_SWITCHES    = $(CXXFLAGS) $(EXTRA_CFLAGS) $(DEFINES) $(INCLUDES)
+CXX_SWITCHES    = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(DEFINES) $(INCLUDES)
+CC_SWITCHES     = $(CFLAGS) $(EXTRA_CFLAGS) $(DEFINES) $(INCLUDES)
 
 SERVER_SRCS     = \
@@ -199 +200 @@
 %.o: %.cpp
         $(CXX) $(CXX_SWITCHES) -c $< -o $@
+
+%.o: %.c
+        $(CC) $(CC_SWITCHES) -c $< -o $@
 
 clean:
@@ -249 +253 @@
 vtkRpAxisActor2D.o: vtkRpAxisActor2D.h
 vtkRpCubeAxesActor.o: vtkRpCubeAxesActor.h vtkRpAxisActor.h vtkRpAxisActor2D.h
+md5.o: md5.h