UPDATE TO V1.0.8Z

calvinwilliams · Jul 2, 2014 · fd62edd · fd62edd
1 parent e5f7283
commit fd62edd
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 85 deletions.
diff --git a/src/makefile.AIX b/src/makefile.AIX
@@ -82,9 +82,7 @@ clean		:
 DFTHDER		=	$(csm_FILE_DFTHDER) $(cui_FILE_DFTHDER) $(dtd_FILE_DFTHDER) $(prt_FILE_DFTHDER) $(fmd_FILE_DFTHDER) $(smd_FILE_DFTHDER) $(def_FILE_DFTHDER) $(act_FILE_DFTHDER)
 
 # �ύ��װ����
-install		:
-	@make -f makefile.AIX
-
+install		:	all
 	@if [ -n "$(LIB)" -a -n "$(LIBINST)" ] ; then \
 		if [ ! -d "$(LIBINST)" ] ; then \
 			echo $(MKDIR) $(LIBINST) ; \

diff --git a/src/makefile.Linux b/src/makefile.Linux
@@ -84,9 +84,7 @@ DFTHDER		=	$(csm_FILE_DFTHDER) $(cui_FILE_DFTHDER) $(dtd_FILE_DFTHDER) $(prt_FIL
 
 # �ύ��װ����
 .PHONY:install
-install		:
-	@make -f makefile.Linux
-
+install		:	all
 ifneq ($(strip $(LIB)),)
 ifneq ($(strip $(LIBINST)),)
 	@if [ ! -d "$(LIBINST)" ] ; then \

diff --git a/src/makefile.WINDOWS-MinGW b/src/makefile.WINDOWS-MinGW
@@ -79,9 +79,7 @@ clean		:
 DFTHDER		=	$(csm_FILE_DFTHDER) $(cui_FILE_DFTHDER) $(dtd_FILE_DFTHDER) $(prt_FILE_DFTHDER) $(fmd_FILE_DFTHDER) $(smd_FILE_DFTHDER) $(def_FILE_DFTHDER) $(act_FILE_DFTHDER)
 
 # �ύ��װ����
-install		:
-	@make -f makefile.WINDOWS-MinGW
-
+install		:	all
 ifneq ($(strip $(LIB)),)
 ifneq ($(strip $(LIBINST)),)
 	-$(MKDIR) "$(LIBINST)"

diff --git a/test/makefile.AIX b/test/makefile.AIX
@@ -84,34 +84,7 @@ clean		:
 DFTHDER		=	$(csm_FILE_DFTHDER) $(cui_FILE_DFTHDER) $(dtd_FILE_DFTHDER) $(prt_FILE_DFTHDER) $(fmd_FILE_DFTHDER) $(smd_FILE_DFTHDER) $(def_FILE_DFTHDER) $(act_FILE_DFTHDER)
 
 # �ύ��װ����
-install		:
-	@make -f makefile.AIX
-
-	@if [ -n "$(BIN)" -a -n "$(BININST)" ] ; then \
-		if [ ! -d "$(BININST)" ] ; then \
-			echo $(MKDIR) $(BININST) ; \
-			$(MKDIR) $(BININST) ; \
-		fi ; \
-		for FILE in `echo $(BIN)` ; do \
-			echo $(CP) $$FILE $(BININST)/ ; \
-			$(RM) $(BININST)/$$FILE ; \
-			$(CP) $$FILE $(BININST)/ ; \
-		done \
-	fi
-
-	@if [ -n "$(DFTHDER)" -a -n "$(DFTHDERINST)" ] ; then \
-		if [ ! -d "$(DFTHDERINST)" ] ; then \
-			echo $(MKDIR) $(DFTHDERINST) ; \
-			$(MKDIR) $(DFTHDERINST) ; \
-		fi ; \
-		for FILE in `echo $(DFTHDER)` ; do \
-			echo $(CP) $$FILE $(DFTHDERINST)/ ; \
-			$(RM) $(DFTHDERINST)/$$FILE ; \
-			$(CP) $$FILE $(DFTHDERINST)/ ; \
-		done \
-	fi
-
-
+install		:	all
 
 ###### Ŀ���ļ�������ϵ
 test_hello		:	test_hello.o

diff --git a/test/makefile.Linux b/test/makefile.Linux
@@ -86,36 +86,7 @@ DFTHDER		=	$(csm_FILE_DFTHDER) $(cui_FILE_DFTHDER) $(dtd_FILE_DFTHDER) $(prt_FIL
 
 # �ύ��װ����
 .PHONY:install
-install		:
-	@make -f makefile.Linux
-
-ifneq ($(strip $(BIN)),)
-ifneq ($(strip $(BININST)),)
-	@if [ ! -d "$(BININST)" ] ; then \
-		echo $(MKDIR) $(BININST) ; \
-		$(MKDIR) $(BININST) ; \
-	fi ; \
-	for FILE in `echo $(BIN)` ; do \
-		echo $(CP) $$FILE $(BININST)/ ; \
-		$(RM) $(BININST)/$$FILE ; \
-		$(CP) $$FILE $(BININST)/ ; \
-	done
-endif
-endif
-
-ifneq ($(strip $(DFTHDER)),)
-ifneq ($(strip $(DFTHDERINST)),)
-	@if [ ! -d "$(DFTHDERINST)" ] ; then \
-		echo $(MKDIR) $(DFTHDERINST) ; \
-		$(MKDIR) $(DFTHDERINST) ; \
-	fi ; \
-	for FILE in `echo $(DFTHDER)` ; do \
-		echo $(CP) $$FILE $(DFTHDERINST)/ ; \
-		$(RM) $(DFTHDERINST)/$$FILE ; \
-		$(CP) $$FILE $(DFTHDERINST)/ ; \
-	done
-endif
-endif
+install		:	all
 
 
 

diff --git a/test/makefile.WINDOWS-MinGW b/test/makefile.WINDOWS-MinGW
@@ -81,24 +81,7 @@ clean		:
 DFTHDER		=	$(csm_FILE_DFTHDER) $(cui_FILE_DFTHDER) $(dtd_FILE_DFTHDER) $(prt_FILE_DFTHDER) $(fmd_FILE_DFTHDER) $(smd_FILE_DFTHDER) $(def_FILE_DFTHDER) $(act_FILE_DFTHDER)
 
 # �ύ��װ����
-install		:
-	@make -f makefile.WINDOWS-MinGW
-
-ifneq ($(strip $(BIN)),)
-ifneq ($(strip $(BININST)),)
-	-$(MKDIR) "$(BININST)"
-	$(CP) $(BIN) "$(BININST)/"
-endif
-endif
-
-ifneq ($(strip $(DFTHDER)),)
-ifneq ($(strip $(DFTHDERINST)),)
-	-$(MKDIR) "$(DFTHDERINST)"
-	$(CP) $(DFTHDER) "$(DFTHDERINST)/"
-endif
-endif
-
-
+install		:	all
 
 ###### Ŀ���ļ�������ϵ
 test_hello.exe		:	test_hello.o