Browse Source

Fix Makefile

Michael Moon 13 years ago
parent
commit
77d503fa13
1 changed files with 5 additions and 10 deletions
  1. 5
    10
      Marlin/Makefile

+ 5
- 10
Marlin/Makefile View File

112
 CXXDEFS = -DF_CPU=$(F_CPU)
112
 CXXDEFS = -DF_CPU=$(F_CPU)
113
 
113
 
114
 # Add all the source directories as include directories too
114
 # Add all the source directories as include directories too
115
-CINCS = ${patsubst %,-I%,${subst :, ,${VPATH}}}
116
-CXXINCS = ${patsubst %,-I%,${subst :, ,${VPATH}}}
115
+CINCS = ${addprefix -I ,${VPATH}}
116
+CXXINCS = ${addprefix -I ,${VPATH}}
117
 
117
 
118
 # Compiler flag to set the C Standard level.
118
 # Compiler flag to set the C Standard level.
119
 # c89   - "ANSI" C
119
 # c89   - "ANSI" C
185
 # ..and the .o depends from the .cpp
185
 # ..and the .o depends from the .cpp
186
 #applet/%.o: applet/%.cpp
186
 #applet/%.o: applet/%.cpp
187
 
187
 
188
-applet/%.cpp: %.pde
188
+applet/%.cpp: %.pde $(MAKEFILE)
189
 # Here is the "preprocessing".
189
 # Here is the "preprocessing".
190
 # It creates a .cpp file based with the same name as the .pde file.
190
 # It creates a .cpp file based with the same name as the .pde file.
191
 # On top of the new .cpp file comes the WProgram.h header.
191
 # On top of the new .cpp file comes the WProgram.h header.
264
 applet/core.a: $(OBJ)
264
 applet/core.a: $(OBJ)
265
 	@for i in $(OBJ); do echo "  AR    $$i"; $(AR) rcs applet/core.a $$i; done
265
 	@for i in $(OBJ); do echo "  AR    $$i"; $(AR) rcs applet/core.a $$i; done
266
 
266
 
267
-applet/%.o: %.c
267
+applet/%.o: %.c Configuration.h Configuration_adv.h $(MAKEFILE)
268
 	@echo "  CC    $@"
268
 	@echo "  CC    $@"
269
 	@$(CC) -MMD -c $(ALL_CFLAGS) $< -o $@
269
 	@$(CC) -MMD -c $(ALL_CFLAGS) $< -o $@
270
 
270
 
271
-applet/%.o: %.cpp
272
-	@echo "  CXX   $@"
273
-	@$(CXX) -MMD -c $(ALL_CXXFLAGS) $< -o $@
274
-
275
-# special rule for autogenerated files...
276
-applet/%.o: applet/%.cpp
271
+applet/%.o: %.cpp Configuration.h Configuration_adv.h $(MAKEFILE)
277
 	@echo "  CXX   $@"
272
 	@echo "  CXX   $@"
278
 	@$(CXX) -MMD -c $(ALL_CXXFLAGS) $< -o $@
273
 	@$(CXX) -MMD -c $(ALL_CXXFLAGS) $< -o $@
279
 
274
 

Loading…
Cancel
Save