From 0c6135ee7c33696f96e517c21bd0726db7a0a68e Mon Sep 17 00:00:00 2001
From: sirakaba <sirakaba@9df91469-1e22-0410-86e7-ea8537beb833>
Date: Sat, 20 Feb 2010 08:12:23 +0000
Subject: [PATCH] =?utf8?q?Makefile=E3=82=92=E5=85=B1=E9=80=9A=E5=8C=96?=
 =?utf8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@244 9df91469-1e22-0410-86e7-ea8537beb833
---
 src/Makefile                |  9 ++++++---
 src/common/Makefile.default | 24 ++++++++++++++++++++++++
 src/common/handle/Makefile  |  6 ++++++
 src/common/library/Makefile |  6 ++++++
 src/lychee/Makefile         | 41 ++++++++++++-----------------------------
 src/plugin/Makefile.default |  3 ++-
 6 files changed, 56 insertions(+), 33 deletions(-)
 create mode 100644 src/common/Makefile.default
 create mode 100644 src/common/handle/Makefile
 create mode 100644 src/common/library/Makefile

diff --git a/src/Makefile b/src/Makefile
index e8089d1..090da65 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,16 +4,19 @@
 .PHONY: all clean
 
 all:
+	make -C common/header
+	make -C common/handle
+	make -C common/library
 	make -C lychee
 	make -C plugin/7zArc
 	make -C plugin/cuiWrapper
 	make -C plugin/rarArc
-	make -C common/header
 
 clean:
+	make -C common/header clean
+	make -C common/handle clean
+	make -C common/library clean
 	make -C lychee clean
 	make -C plugin/7zArc clean
 	make -C plugin/cuiWrapper clean
 	make -C plugin/rarArc clean
-	make -C common/header clean
-	rm -f common/header/TPIHandle.o common/library/library.o
diff --git a/src/common/Makefile.default b/src/common/Makefile.default
new file mode 100644
index 0000000..09f86d6
--- /dev/null
+++ b/src/common/Makefile.default
@@ -0,0 +1,24 @@
+# Makefile.
+# $Id: Makefile 125 2009-11-19 14:17:38Z sirakaba $
+
+# Define compilers.
+CC = g++
+CPPFLAGS = -c -O3 -Wall -W `wx-config --cppflags`
+LDFLAGS  = -s `wx-config --libs`
+
+.PHONY: all clean
+.SUFFIXES: .cpp .o
+
+all: $(DIR_OBJ) $(addprefix $(DIR_OBJ)/,$(OBJS)) $(IN_ADD)
+ifdef OUT_EXE
+	$(CC) $(LDFLAGS) -o $(OUT_EXE) $(addprefix $(DIR_OBJ)/,$(OBJS))
+endif
+
+clean:
+	rm -f -r $(addprefix $(DIR_OBJ)/,$(OBJS)) $(OUT_EXE)
+
+$(DIR_OBJ)/%.o: %.cpp
+	$(CC) $(CPPFLAGS) -o $@ $<
+
+$(DIR_OBJ):
+	mkdir $(DIR_OBJ)
diff --git a/src/common/handle/Makefile b/src/common/handle/Makefile
new file mode 100644
index 0000000..2ebf274
--- /dev/null
+++ b/src/common/handle/Makefile
@@ -0,0 +1,6 @@
+# Makefile.
+# $Id: Makefile 125 2009-11-19 14:17:38Z sirakaba $
+
+OBJS = TPIHandle.o
+DIR_OBJ = ../../tmp
+include ../Makefile.default
diff --git a/src/common/library/Makefile b/src/common/library/Makefile
new file mode 100644
index 0000000..1808fa0
--- /dev/null
+++ b/src/common/library/Makefile
@@ -0,0 +1,6 @@
+# Makefile.
+# $Id: Makefile 125 2009-11-19 14:17:38Z sirakaba $
+
+OBJS = library.o
+DIR_OBJ = ../../tmp
+include ../Makefile.default
diff --git a/src/lychee/Makefile b/src/lychee/Makefile
index 6f647d6..21f66ff 100644
--- a/src/lychee/Makefile
+++ b/src/lychee/Makefile
@@ -1,38 +1,21 @@
 # Makefile.
 # $Id$
 
-# Define compilers.
-CC = g++
-CPPFLAGS = -c -O3 -Wall -W `wx-config --cppflags`
-LDFLAGS  = -s `wx-config --libs`
-
 # Define i/o files.
-DIR_OBJ  = ../tmp
-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
-
-DIR_XRC  = ../../share/xrc
-XRCS  = frm_main.xrc dlg_make.xrc dlg_process.xrc
-
-DIR_LOC  = ../../share/locale
-POT = lychee.pot
-
+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
 OUT_EXE  = ../../bin/lychee
+DIR_OBJ  = ../tmp
+DIR_SHR  = ../../share
+DIR_XRC  = $(DIR_SHR)/xrc
+DIR_LOC  = $(DIR_SHR)/locale
+XRCS     = frm_main.xrc dlg_make.xrc dlg_process.xrc
+POT      = lychee.pot
+IN_ADD   = $(DIR_LOC)/$(POT)
 
-.PHONY: all clean
-.SUFFIXES: .cpp .o
-
-all: $(DIR_OBJ) $(addprefix $(DIR_OBJ)/,$(OBJS)) $(addprefix $(DIR_XRC)/,$(XRCS))
-	$(CC) $(LDFLAGS) -o $(OUT_EXE) $(addprefix $(DIR_OBJ)/,$(OBJS))
-	wxrc --gettext $(addprefix $(DIR_XRC)/,$(XRCS)) | xgettext -C -k"_" --from-code=utf-8 -D ./ -o $(DIR_LOC)/$(POT) *.cpp -
-
-clean:
-	rm -f -r $(DIR_OBJ) $(OUT_EXE)
-
-$(DIR_OBJ):
-	mkdir $(DIR_OBJ)
-
-$(DIR_OBJ)/%.o: %.cpp
-	$(CC) $(CPPFLAGS) -o $@ $<
+include ../common/Makefile.default
 
 $(DIR_XRC)/%.xrc: $(addprefix ui/,%.fbp)
 	wxformbuilder -g $<
+
+$(DIR_LOC)/$(POT): $(addprefix $(DIR_XRC)/,$(XRCS))
+	wxrc --gettext $< | xgettext -C -k"_" --from-code=utf-8 -D ./ -o $@ *.cpp -
diff --git a/src/plugin/Makefile.default b/src/plugin/Makefile.default
index 5a7c215..0ef6ec8 100644
--- a/src/plugin/Makefile.default
+++ b/src/plugin/Makefile.default
@@ -11,7 +11,7 @@ DIR_OBJ  = ../../tmp/$(PLUGIN_NAME)
 ifdef NOUSE_LIBRARY
   OBJS   = $(PLUGIN_NAME).o
 else
-  OBJS   = $(PLUGIN_NAME).o ../../common/library/library.o
+  OBJS   = $(PLUGIN_NAME).o ../library.o
 endif
 
 IN_DEF   = ../../common/header/plugin.def
@@ -25,6 +25,7 @@ all: $(DIR_OBJ) $(addprefix $(DIR_OBJ)/,$(OBJS) $(OBJS_ADD))
 
 clean:
 	rm -f -r $(addprefix $(DIR_OBJ)/,$(OBJS) $(OBJS_ADD)) $(OUT_LIB)
+	rmdir $(DIR_OBJ)
 
 $(DIR_OBJ):
 	mkdir $(DIR_OBJ)
-- 
2.11.0