summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorleo2005-06-05 01:51:55 +0000
committerleo2005-06-05 01:51:55 +0000
commitf9f670643398aac6ad917505ccd76d2cf50230c7 (patch)
tree11e5c96a29e36d26a766d2d9c25d0dd83af7ebf3 /Makefile
parent583033b8bc46f46a039144c0d8fa97d406bc64ee (diff)
Updated LeoCAD to use GTK+ 2.0
git-svn-id: http://svn.leocad.org/trunk@403 c7d43263-9d01-0410-8a33-9dba5d9f93d6
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 58ff93d..c9028bc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
### ALL CONFIGURATION SHOULD BE IN CONFIG.MK, NOT HERE
include config.mk
--include $(OSDIR)/config.mk
### Module directories
MODULES := $(OSDIR) common
@@ -18,6 +17,8 @@ SRC :=
BIN := bin/leocad
+-include $(OSDIR)/config.mk
+
### include the description for
### each module
include $(patsubst %,%/module.mk,$(MODULES))
@@ -53,12 +54,12 @@ endif
### dependencies
%.d: %.c
@[ -s $(OSDIR)/config.h ] || $(MAKE) config
- @./depend.sh $@ $(@D) $(CC) $(CFLAGS) $(CPPFLAGS) -w $<
+ @$(CC) -MM -MT '$(patsubst %.d,%.o, $@)' $(CFLAGS) $(CPPFLAGS) -w $< > $@
@[ -s $@ ] || rm -f $@
%.d: %.cpp
@[ -s $(OSDIR)/config.h ] || $(MAKE) config
- @./depend.sh $@ $(@D) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -w $<
+ @$(CXX) -MM -MT '$(patsubst %.d,%.o, $@)' $(CXXFLAGS) $(CPPFLAGS) -w $< > $@
@[ -s $@ ] || rm -f $@
### Various cleaning functions