MG: fixed jitform compiling

git-svn-id: trunk@3478 -

Makefile

@@ -209,7 +209,7 @@ endif
 export LCL_PLATFORM
 endif
 RCPP?=$(strip $(firstword $(wildcard $(addsuffix /cpp$(SRCEXEEXT), $(SEARCHPATH)))))
-override TARGET_DIRS+=lcl components designer/jitform
+override TARGET_DIRS+=lcl components designer
 override TARGET_PROGRAMS+=lazarus
 override TARGET_EXAMPLEDIRS+=examples
 override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(PPUEXT)) $(wildcard ./debugger/*$(OEXT)) $(wildcard ./debugger/*$(PPUEXT))
@@ -1535,7 +1535,7 @@ fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
 TARGET_DIRS_LCL=1
 TARGET_DIRS_COMPONENTS=1
-TARGET_DIRS_DESIGNER/JITFORM=1
+TARGET_DIRS_DESIGNER=1
 ifdef TARGET_DIRS_LCL
 lcl_all:
 	$(MAKE) -C lcl all
@@ -1622,48 +1622,48 @@ components:
 	$(MAKE) -C components all
 .PHONY: components_all components_debug components_smart components_release components_examples components_shared components_install components_sourceinstall components_exampleinstall components_distinstall components_zipinstall components_zipsourceinstall components_zipexampleinstall components_zipdistinstall components_clean components_distclean components_cleanall components_info components_makefiles components
 endif
-ifdef TARGET_DIRS_DESIGNER/JITFORM
+ifdef TARGET_DIRS_DESIGNER
-designer/jitform_all:
+designer_all:
-	$(MAKE) -C designer/jitform all
+	$(MAKE) -C designer all
-designer/jitform_debug:
+designer_debug:
-	$(MAKE) -C designer/jitform debug
+	$(MAKE) -C designer debug
-designer/jitform_smart:
+designer_smart:
-	$(MAKE) -C designer/jitform smart
+	$(MAKE) -C designer smart
-designer/jitform_release:
+designer_release:
-	$(MAKE) -C designer/jitform release
+	$(MAKE) -C designer release
-designer/jitform_examples:
+designer_examples:
-	$(MAKE) -C designer/jitform examples
+	$(MAKE) -C designer examples
-designer/jitform_shared:
+designer_shared:
-	$(MAKE) -C designer/jitform shared
+	$(MAKE) -C designer shared
-designer/jitform_install:
+designer_install:
-	$(MAKE) -C designer/jitform install
+	$(MAKE) -C designer install
-designer/jitform_sourceinstall:
+designer_sourceinstall:
-	$(MAKE) -C designer/jitform sourceinstall
+	$(MAKE) -C designer sourceinstall
-designer/jitform_exampleinstall:
+designer_exampleinstall:
-	$(MAKE) -C designer/jitform exampleinstall
+	$(MAKE) -C designer exampleinstall
-designer/jitform_distinstall:
+designer_distinstall:
-	$(MAKE) -C designer/jitform distinstall
+	$(MAKE) -C designer distinstall
-designer/jitform_zipinstall:
+designer_zipinstall:
-	$(MAKE) -C designer/jitform zipinstall
+	$(MAKE) -C designer zipinstall
-designer/jitform_zipsourceinstall:
+designer_zipsourceinstall:
-	$(MAKE) -C designer/jitform zipsourceinstall
+	$(MAKE) -C designer zipsourceinstall
-designer/jitform_zipexampleinstall:
+designer_zipexampleinstall:
-	$(MAKE) -C designer/jitform zipexampleinstall
+	$(MAKE) -C designer zipexampleinstall
-designer/jitform_zipdistinstall:
+designer_zipdistinstall:
-	$(MAKE) -C designer/jitform zipdistinstall
+	$(MAKE) -C designer zipdistinstall
-designer/jitform_clean:
+designer_clean:
-	$(MAKE) -C designer/jitform clean
+	$(MAKE) -C designer clean
-designer/jitform_distclean:
+designer_distclean:
-	$(MAKE) -C designer/jitform distclean
+	$(MAKE) -C designer distclean
-designer/jitform_cleanall:
+designer_cleanall:
-	$(MAKE) -C designer/jitform cleanall
+	$(MAKE) -C designer cleanall
-designer/jitform_info:
+designer_info:
-	$(MAKE) -C designer/jitform info
+	$(MAKE) -C designer info
-designer/jitform_makefiles:
+designer_makefiles:
-	$(MAKE) -C designer/jitform makefiles
+	$(MAKE) -C designer makefiles
-designer/jitform:
+designer:
-	$(MAKE) -C designer/jitform all
+	$(MAKE) -C designer all
-.PHONY: designer/jitform_all designer/jitform_debug designer/jitform_smart designer/jitform_release designer/jitform_examples designer/jitform_shared designer/jitform_install designer/jitform_sourceinstall designer/jitform_exampleinstall designer/jitform_distinstall designer/jitform_zipinstall designer/jitform_zipsourceinstall designer/jitform_zipexampleinstall designer/jitform_zipdistinstall designer/jitform_clean designer/jitform_distclean designer/jitform_cleanall designer/jitform_info designer/jitform_makefiles designer/jitform
+.PHONY: designer_all designer_debug designer_smart designer_release designer_examples designer_shared designer_install designer_sourceinstall designer_exampleinstall designer_distinstall designer_zipinstall designer_zipsourceinstall designer_zipexampleinstall designer_zipdistinstall designer_clean designer_distclean designer_cleanall designer_info designer_makefiles designer
 endif
 TARGET_EXAMPLEDIRS_EXAMPLES=1
 ifdef TARGET_EXAMPLEDIRS_EXAMPLES
@@ -1741,7 +1741,7 @@ endif
 	$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT)
 tools: lcl components
 	$(MAKE) -C tools
-all: lcl components ide
+all: lcl components designer ide
 cleanide:
 	$(DEL) $(wildcard *$(OEXT))
 	$(DEL) $(wildcard *$(PPUEXT))

Makefile.fpc

@@ -11,7 +11,7 @@ packages=fcl regexpr
 
 [target]
 programs=lazarus
-dirs=lcl components designer/jitform
+dirs=lcl components designer
 exampledirs=examples
 
 [compiler]
@@ -59,7 +59,7 @@ endif
 tools: lcl components
         $(MAKE) -C tools
 
-all: lcl components ide
+all: lcl components designer ide
 
 cleanide:
         $(DEL) $(wildcard *$(OEXT))

designer/Makefile.fpc

@@ -0,0 +1,14 @@
+#   $Id$
+#
+#   Makefile.fpc for Lazarus for Free Pascal
+#
+
+[target]
+dirs=jitform
+
+[clean]
+files=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT))
+
+[rules]
+
+cleanall: clean