• R/O
  • SSH
  • HTTPS

molby: Commit


Commit MetaInfo

Revision129 (tree)
Time2011-10-01 01:02:19
Authortoshinagata1964

Log Message

Makefile: "make depend" now creates a dependency file in the building directory.

Change Summary

Incremental Difference

--- trunk/Makefile (revision 128)
+++ trunk/Makefile (revision 129)
@@ -21,7 +21,8 @@
2121 endif
2222
2323 WXLIB_LIST = core,base,gl,adv
24-OBJECTS = ConsoleFrame.o GlobalParameterFrame.o GlobalParameterFilesFrame.o MoleculeView.o MyApp.o MyCommand.o MyDocument.o MyGLCanvas.o MySlider.o MyClipboardData.o ProgressFrame.o MyListCtrl.o MyDocManager.o wxKillAddition.o docview.o RubyDialogFrame.o MyVersion.o MyThread.o MolLib.a Ruby_bind.a
24+OBJECTS = ConsoleFrame.o GlobalParameterFrame.o GlobalParameterFilesFrame.o MoleculeView.o MyApp.o MyCommand.o MyDocument.o MyGLCanvas.o MySlider.o MyClipboardData.o ProgressFrame.o MyListCtrl.o MyDocManager.o wxKillAddition.o docview.o RubyDialogFrame.o MyVersion.o MyThread.o
25+LIBS = MolLib.a Ruby_bind.a
2526 RUBY_EXTLIB = scanf.rb
2627
2728 ifeq ($(TARGET_PLATFORM),MAC)
@@ -64,6 +65,20 @@
6465 rm -rf $(HOMETEMP)
6566 endif
6667
68+depend: cleandep $(DESTPREFIX) $(OBJECTS:%.o=$(DESTPREFIX)/%.d) $(EXTRA_OBJECTS:%.o=$(DESTPREFIX)/%.d)
69+ cat $(DESTPREFIX)/*.d > $(DESTPREFIX)/Makefile.depend
70+
71+cleandep:
72+ rm -f $(DESTPREFIX)/Makefile.depend
73+
74+-include $(DESTPREFIX)/Makefile.depend
75+
76+$(DESTPREFIX)/%.d : ../wxSources/%.cpp
77+ $(CC) -MM $< >$@ $(subst -arch ppc,,$(CFLAGS))
78+
79+$(DESTPREFIX)/%.d : ../wxSources/%.c
80+ $(CC) -MM $< >$@ $(subst -arch ppc,,$(CFLAGS))
81+
6782 $(DESTPREFIX)/%.o : ../wxSources/%.cpp
6883 $(CC) -c $< -o $@ $(CFLAGS)
6984
@@ -76,7 +91,7 @@
7691 $(DESTPREFIX)/Ruby_bind.a : ../MolLib/Ruby_bind/*.[ch]
7792 mkdir -p $(DESTPREFIX)/MolLib/Ruby_bind; cd ../MolLib/Ruby_bind; $(MAKE)
7893
79-ALL_OBJECTS = $(OBJECTS) $(EXTRA_OBJECTS) $(RESOURCE)
94+ALL_OBJECTS = $(OBJECTS) $(EXTRA_OBJECTS) $(LIBS) $(RESOURCE)
8095 DESTOBJECTS = $(addprefix $(DESTPREFIX)/,$(ALL_OBJECTS))
8196 $(DESTPREFIX)/$(EXECUTABLE) : $(DESTOBJECTS)
8297 $(CC) -o $@ $(DESTOBJECTS) $(CFLAGS) $(LDFLAGS)
@@ -114,9 +129,9 @@
114129 endif
115130
116131 clean:
117-
118132 rm -rf $(DESTPREFIX)
119133 # rm -f $(EXECUTABLE) $(OBJECTS)
120134 # rm -rf $(PRODUCT)
121135 # cd ../MolLib; $(MAKE) clean
122136 # cd ../MolLib/Ruby_bind; $(MAKE) clean
137+
Show on old repository browser