Browse Source

* set target always

peter 26 years ago
parent
commit
d6a6c93f64
3 changed files with 44 additions and 17 deletions
  1. 18 6
      fcl/go32v2/Makefile
  2. 14 6
      fcl/linux/Makefile
  3. 12 5
      fcl/win32/Makefile

+ 18 - 6
fcl/go32v2/Makefile

@@ -20,6 +20,10 @@
 # Default place of the makefile.fpc
 DEFAULTFPCDIR=../..
 
+# set target and cpu which are required
+override OS_TARGET=go32v2
+override CPU=i386
+
 # Include files
 INC=../inc
 PROCINC=../$(CPU)
@@ -38,7 +42,11 @@ DEFAULTUNITS=1
 # Real targets
 #####################################################################
 
-UNITOBJECTS=classes
+# INCUNITS is defined in makefile.inc
+# They are default units for all platforms.
+include $(INC)/Makefile.inc
+
+UNITOBJECTS=$(INCUNITS)
 EXEOBJECTS=
 
 
@@ -47,9 +55,9 @@ EXEOBJECTS=
 #####################################################################
 
 .PHONY: all clean install info \
-        staticlib sharedlib libsclean \
-        staticinstall sharedinstall libinstall \
-        
+	staticlib sharedlib libsclean \ staticinstall sharedinstall
+	libinstall \
+
 all: testfpcmake fpc_all
 
 clean: testfpcmake fpc_clean
@@ -116,14 +124,18 @@ endif
 
 vpath %$(PASEXT) $(INC)
 
-include $(INC)/Makefile.inc
 INCFILES=$(addprefix $(INC)/,$(INCNAMES))
 
 classes$(PPUEXT): $(INCFILES) classes$(PASEXT)
 
+inifiles$(PPUEXT): classes$(PPUEXT) inifiles$(PASEXT)
+
 #
 # $Log$
-# Revision 1.3  1999-04-08 10:18:48  peter
+# Revision 1.4  1999-04-22 10:50:44  peter
+#   * set target always
+#
+# Revision 1.3	1999/04/08 10:18:48  peter
 #   * makefile updates
 #
 #

+ 14 - 6
fcl/linux/Makefile

@@ -20,6 +20,10 @@
 # Default place of the makefile.fpc
 DEFAULTFPCDIR=../..
 
+# set target and cpu which are required
+override OS_TARGET=linux
+override CPU=i386
+
 # Include files
 INC=../inc
 PROCINC=../$(CPU)
@@ -51,9 +55,9 @@ EXEOBJECTS=
 #####################################################################
 
 .PHONY: all clean install info \
-        staticlib sharedlib libsclean \
-        staticinstall sharedinstall libinstall \
-        
+	staticlib sharedlib libsclean \
+	staticinstall sharedinstall libinstall \
+
 all: testfpcmake fpc_all
 
 clean: testfpcmake fpc_clean
@@ -113,7 +117,6 @@ testfpcmake:
 endif
 
 
-
 #####################################################################
 # Dependencies
 #####################################################################
@@ -124,12 +127,17 @@ INCFILES=$(addprefix $(INC)/,$(INCNAMES))
 
 classes$(PPUEXT): $(INCFILES) classes$(PASEXT)
 
+inifiles$(PPUEXT): classes$(PPUEXT) inifiles$(PASEXT)
+
 #
 # $Log$
-# Revision 1.8  1999-04-08 15:58:44  michael
+# Revision 1.9  1999-04-22 10:50:45  peter
+#   * set target always
+#
+# Revision 1.8	1999/04/08 15:58:44  michael
 # + INCUNITS added
 #
-# Revision 1.7  1999/04/08 10:18:59  peter
+# Revision 1.7	1999/04/08 10:18:59  peter
 #   * makefile updates
 #
 #

+ 12 - 5
fcl/win32/Makefile

@@ -20,6 +20,10 @@
 # Default place of the makefile.fpc
 DEFAULTFPCDIR=../..
 
+# set target and cpu which are required
+override OS_TARGET=win32
+override CPU=i386
+
 # Include files
 INC=../inc
 PROCINC=../$(CPU)
@@ -51,9 +55,9 @@ EXEOBJECTS=
 #####################################################################
 
 .PHONY: all clean install info \
-        staticlib sharedlib libsclean \
-        staticinstall sharedinstall libinstall \
-        
+	staticlib sharedlib libsclean \
+	staticinstall sharedinstall libinstall \
+
 all: testfpcmake fpc_all
 
 clean: testfpcmake fpc_clean
@@ -128,10 +132,13 @@ inifiles$(PPUEXT): classes$(PPUEXT) inifiles$(PASEXT)
 
 #
 # $Log$
-# Revision 1.6  1999-04-12 14:40:17  michael
+# Revision 1.7  1999-04-22 10:50:46  peter
+#   * set target always
+#
+# Revision 1.6	1999/04/12 14:40:17  michael
 # + Fixed inifiles dependencies
 #
-# Revision 1.5  1999/04/08 10:19:05  peter
+# Revision 1.5	1999/04/08 10:19:05  peter
 #   * makefile updates
 #
 #