Makefileを共通化。

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@244 9df91469-1e22-0410-86e7-ea8537beb833

diff --git a/src/Makefile b/src/Makefile
index e8089d1..090da65 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,16 +4,19 @@
 .PHONY: all clean\r
 \r
 all:\r
+       make -C common/header\r
+       make -C common/handle\r
+       make -C common/library\r
        make -C lychee\r
        make -C plugin/7zArc\r
        make -C plugin/cuiWrapper\r
        make -C plugin/rarArc\r
-       make -C common/header\r
 \r
 clean:\r
+       make -C common/header clean\r
+       make -C common/handle clean\r
+       make -C common/library clean\r
        make -C lychee clean\r
        make -C plugin/7zArc clean\r
        make -C plugin/cuiWrapper clean\r
        make -C plugin/rarArc clean\r
-       make -C common/header clean\r
-       rm -f common/header/TPIHandle.o common/library/library.o\r

diff --git a/src/common/Makefile.default b/src/common/Makefile.default
new file mode 100644 (file)
index 0000000..09f86d6
--- /dev/null
+++ b/src/common/Makefile.default
@@ -0,0 +1,24 @@
+# Makefile.\r
+# $Id: Makefile 125 2009-11-19 14:17:38Z sirakaba $\r
+\r
+# Define compilers.\r
+CC = g++\r
+CPPFLAGS = -c -O3 -Wall -W `wx-config --cppflags`\r
+LDFLAGS  = -s `wx-config --libs`\r
+\r
+.PHONY: all clean\r
+.SUFFIXES: .cpp .o\r
+\r
+all: $(DIR_OBJ) $(addprefix $(DIR_OBJ)/,$(OBJS)) $(IN_ADD)\r
+ifdef OUT_EXE\r
+       $(CC) $(LDFLAGS) -o $(OUT_EXE) $(addprefix $(DIR_OBJ)/,$(OBJS))\r
+endif\r
+\r
+clean:\r
+       rm -f -r $(addprefix $(DIR_OBJ)/,$(OBJS)) $(OUT_EXE)\r
+\r
+$(DIR_OBJ)/%.o: %.cpp\r
+       $(CC) $(CPPFLAGS) -o $@ $<\r
+\r
+$(DIR_OBJ):\r
+       mkdir $(DIR_OBJ)\r

diff --git a/src/common/handle/Makefile b/src/common/handle/Makefile
new file mode 100644 (file)
index 0000000..2ebf274
--- /dev/null
+++ b/src/common/handle/Makefile
@@ -0,0 +1,6 @@
+# Makefile.\r
+# $Id: Makefile 125 2009-11-19 14:17:38Z sirakaba $\r
+\r
+OBJS = TPIHandle.o\r
+DIR_OBJ = ../../tmp\r
+include ../Makefile.default\r

diff --git a/src/common/library/Makefile b/src/common/library/Makefile
new file mode 100644 (file)
index 0000000..1808fa0
--- /dev/null
+++ b/src/common/library/Makefile
@@ -0,0 +1,6 @@
+# Makefile.\r
+# $Id: Makefile 125 2009-11-19 14:17:38Z sirakaba $\r
+\r
+OBJS = library.o\r
+DIR_OBJ = ../../tmp\r
+include ../Makefile.default\r

diff --git a/src/lychee/Makefile b/src/lychee/Makefile
index 6f647d6..21f66ff 100644 (file)
--- a/src/lychee/Makefile
+++ b/src/lychee/Makefile
@@ -1,38 +1,21 @@
 # Makefile.\r
 # $Id$\r
 \r
-# Define compilers.\r
-CC = g++\r
-CPPFLAGS = -c -O3 -Wall -W `wx-config --cppflags`\r
-LDFLAGS  = -s `wx-config --libs`\r
-\r
 # Define i/o files.\r
-DIR_OBJ  = ../tmp\r
-OBJS  = lychee.o cls_config.o cls_filedroptarget.o cls_listctrl.o dlg_make.o dlg_process.o frm_main.o functions.o ../common/handle/TPIHandle.o\r
-\r
-DIR_XRC  = ../../share/xrc\r
-XRCS  = frm_main.xrc dlg_make.xrc dlg_process.xrc\r
-\r
-DIR_LOC  = ../../share/locale\r
-POT = lychee.pot\r
-\r
+OBJS     = lychee.o cls_config.o cls_filedroptarget.o cls_listctrl.o dlg_make.o dlg_process.o frm_main.o functions.o TPIHandle.o\r
 OUT_EXE  = ../../bin/lychee\r
+DIR_OBJ  = ../tmp\r
+DIR_SHR  = ../../share\r
+DIR_XRC  = $(DIR_SHR)/xrc\r
+DIR_LOC  = $(DIR_SHR)/locale\r
+XRCS     = frm_main.xrc dlg_make.xrc dlg_process.xrc\r
+POT      = lychee.pot\r
+IN_ADD   = $(DIR_LOC)/$(POT)\r
 \r
-.PHONY: all clean\r
-.SUFFIXES: .cpp .o\r
-\r
-all: $(DIR_OBJ) $(addprefix $(DIR_OBJ)/,$(OBJS)) $(addprefix $(DIR_XRC)/,$(XRCS))\r
-       $(CC) $(LDFLAGS) -o $(OUT_EXE) $(addprefix $(DIR_OBJ)/,$(OBJS))\r
-       wxrc --gettext $(addprefix $(DIR_XRC)/,$(XRCS)) | xgettext -C -k"_" --from-code=utf-8 -D ./ -o $(DIR_LOC)/$(POT) *.cpp -\r
-\r
-clean:\r
-       rm -f -r $(DIR_OBJ) $(OUT_EXE)\r
-\r
-$(DIR_OBJ):\r
-       mkdir $(DIR_OBJ)\r
-\r
-$(DIR_OBJ)/%.o: %.cpp\r
-       $(CC) $(CPPFLAGS) -o $@ $<\r
+include ../common/Makefile.default\r
 \r
 $(DIR_XRC)/%.xrc: $(addprefix ui/,%.fbp)\r
        wxformbuilder -g $<\r
+\r
+$(DIR_LOC)/$(POT): $(addprefix $(DIR_XRC)/,$(XRCS))\r
+       wxrc --gettext $< | xgettext -C -k"_" --from-code=utf-8 -D ./ -o $@ *.cpp -\r

diff --git a/src/plugin/Makefile.default b/src/plugin/Makefile.default
index 5a7c215..0ef6ec8 100644 (file)
--- a/src/plugin/Makefile.default
+++ b/src/plugin/Makefile.default
@@ -11,7 +11,7 @@ DIR_OBJ  = ../../tmp/$(PLUGIN_NAME)
 ifdef NOUSE_LIBRARY\r
   OBJS   = $(PLUGIN_NAME).o\r
 else\r
-  OBJS   = $(PLUGIN_NAME).o ../../common/library/library.o\r
+  OBJS   = $(PLUGIN_NAME).o ../library.o\r
 endif\r
 \r
 IN_DEF   = ../../common/header/plugin.def\r
@@ -25,6 +25,7 @@ all: $(DIR_OBJ) $(addprefix $(DIR_OBJ)/,$(OBJS) $(OBJS_ADD))
 \r
 clean:\r
        rm -f -r $(addprefix $(DIR_OBJ)/,$(OBJS) $(OBJS_ADD)) $(OUT_LIB)\r
+       rmdir $(DIR_OBJ)\r
 \r
 $(DIR_OBJ):\r
        mkdir $(DIR_OBJ)\r