reworked Makefile system, renamed *.cpp to *.cc

git-svn-id: svn://anubis/jcad/trunk@33 c8684bfa-0c3a-0410-9efb-b8c82542f01e

src/Makefile

@@ -1,5 +1,6 @@
 
 SHELL := bash
+TARGET := jcad
 
 export GTKMM_VERSION := 2.4
 export GTKGLEXTMM_VERSION := 1.2
@@ -9,14 +10,14 @@ export CPPFLAGS += -I"$(shell cd)"
 else
 export CPPFLAGS += -I"$(shell pwd)"
 endif
-export CXXFLAGS := -Wall -O2
+export CXXFLAGS := -Wall -O2 \
+	               `pkg-config --cflags gtkmm-$(GTKMM_VERSION)` \
+	               `pkg-config --cflags gtkglextmm-$(GTKGLEXTMM_VERSION)`
 export LDFLAGS := `pkg-config --libs gtkmm-$(GTKMM_VERSION)` \
 	              `pkg-config --libs gtkglextmm-$(GTKGLEXTMM_VERSION)`
 
 SUBDIRS := engine gui main
 
-all: $(TARGET)
-
 .PHONY: $(TARGET)
 $(TARGET):
 	@for d in $(SUBDIRS); \

src/engine/Makefile

@@ -1,30 +1,23 @@
 
-SRCS := Profile.cpp
+OBJS := $(patsubst %.cc,%.o,$(wildcard *.cc))
-MODULES := Profile.o
+DEPS := $(OBJS:.o=.dep)
-TARGET := engine.a
-GTKMM_VERSION := 2.4
-GTKGLEXTMM_VERSION := 1.2
-CPPFLAGS = -I..
-CXXFLAGS = -O2 $(CPPFLAGS) \
-	`pkg-config --cflags gtkmm-$(GTKMM_VERSION)` \
-	`pkg-config --cflags gtkglextmm-$(GTKGLEXTMM_VERSION)`
-DEPS := $(SRCS:.cpp=.d)
 
-all: $(TARGET)
+all: $(DEPS) $(OBJS)
 
-$(TARGET): $(MODULES)
+%.o: %.cc
-	$(AR) rcv $@ $?
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) $<
 
-%.o: %.cpp
+# Make dependency files
-	$(CXX) -c -o $@ $(CXXFLAGS) $<
+%.dep: %.cc
-
-.PHONY: clean
-clean:
-	$(RM) -f *.o *.d *~ $(TARGET)
-
-%.d: %.cpp
 	@set -e; rm -f $@; \
-		$(CXX) -MM $(CPPFLAGS) $< | \
+	  $(CXX) -MM $(CPPFLAGS) $< > $@.$$$$; \
-		sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
+	  sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	  rm -f $@.$$$$
 
-include $(DEPS)
+clean:
+	-$(RM) -f *.o *.dep
+
+# Include dependency files
+ifndef CLEAN
+-include $(DEPS)
+endif

src/gui/Makefile

@@ -1,30 +1,23 @@
 
-SRCS := MainWindow.cpp GUI.cpp Displayer.cpp ProfileDisplayer.cpp PartDisplayer.cpp
+OBJS := $(patsubst %.cc,%.o,$(wildcard *.cc))
-MODULES := MainWindow.o GUI.o Displayer.o ProfileDisplayer.o PartDisplayer.o
+DEPS := $(OBJS:.o=.dep)
-TARGET := gui.a
-GTKMM_VERSION := 2.4
-GTKGLEXTMM_VERSION := 1.2
-CPPFLAGS = -I..
-CXXFLAGS = -O2 $(CPPFLAGS) \
-	`pkg-config --cflags gtkmm-$(GTKMM_VERSION)` \
-	`pkg-config --cflags gtkglextmm-$(GTKGLEXTMM_VERSION)`
-DEPS := $(SRCS:.cpp=.d)
 
-all: $(TARGET)
+all: $(DEPS) $(OBJS)
 
-$(TARGET): $(MODULES)
+%.o: %.cc
-	$(AR) rcv $@ $?
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) $<
 
-%.o: %.cpp
+# Make dependency files
-	$(CXX) -c -o $@ $(CXXFLAGS) $<
+%.dep: %.cc
-
-.PHONY: clean
-clean:
-	$(RM) -f *.o *.d *~ $(TARGET)
-
-%.d: %.cpp
 	@set -e; rm -f $@; \
-		$(CXX) -MM $(CPPFLAGS) $< | \
+	  $(CXX) -MM $(CPPFLAGS) $< > $@.$$$$; \
-		sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
+	  sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	  rm -f $@.$$$$
 
-include $(DEPS)
+clean:
+	-$(RM) -f *.o *.dep
+
+# Include dependency files
+ifndef CLEAN
+-include $(DEPS)
+endif

src/main/Makefile

@@ -1,26 +1,23 @@
 
-SRCS := main.cpp
+OBJS := $(patsubst %.cc,%.o,$(wildcard *.cc))
-MODULES := main.o
+DEPS := $(OBJS:.o=.dep)
-TARGET := main.a
-DEPS := $(SRCS:.cpp=.d)
-CPPFLAGS := -I..
-CXXFLAGS := -O2 $(CPPFLAGS)
 
-all: $(TARGET)
+all: $(DEPS) $(OBJS)
 
-$(TARGET): $(MODULES)
+%.o: %.cc
-	$(AR) rcv $@ $?
+	$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) $<
 
-%.o: %.cpp
+# Make dependency files
-	$(CXX) -c -o $@ $(CXXFLAGS) $<
+%.dep: %.cc
-
-.PHONY: clean
-clean:
-	$(RM) -f *.o *.d *~ $(TARGET)
-
-%.d: %.cpp
 	@set -e; rm -f $@; \
-		$(CXX) -MM $(CPPFLAGS) $< | \
+	  $(CXX) -MM $(CPPFLAGS) $< > $@.$$$$; \
-		sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@
+	  sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	  rm -f $@.$$$$
 
-include $(DEPS)
+clean:
+	-$(RM) -f *.o *.dep
+
+# Include dependency files
+ifndef CLEAN
+-include $(DEPS)
+endif