From a92d88667a8be52be610e19dc8543682e4c093a3 Mon Sep 17 00:00:00 2001 From: Rejean Loyer Date: Sun, 24 Apr 2016 11:36:38 -0400 Subject: [PATCH] tarball: remove Makefiles.epj. update .gitignore. - compiler/bootstrap/Makefile: Fixed whitespace --- .gitignore | 1 + Makefiles.epj | 245 -------------------------------------------- compiler/bootstrap/Makefile | 2 +- 3 files changed, 2 insertions(+), 246 deletions(-) delete mode 100644 Makefiles.epj diff --git a/.gitignore b/.gitignore index 75c7f21..c250cc5 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ debug/ release/ dat/ .configs/ +*.tmp/ # CodeGuard files .codeguard/ diff --git a/Makefiles.epj b/Makefiles.epj deleted file mode 100644 index ccd2201..0000000 --- a/Makefiles.epj +++ /dev/null @@ -1,245 +0,0 @@ -{ - "Version" : 0.2, - "ModuleName" : "Makefiles", - "Options" : { - "Warnings" : "All", - "TargetType" : "Executable", - "TargetFileName" : "Makefiles", - "Libraries" : [ - "ecere" - ] - }, - "Configurations" : [ - - ], - "Files" : [ - { - "Folder" : "audio", - "Files" : [ - "Makefile" - ] - }, - { - "Folder" : "compiler", - "Files" : [ - { - "Folder" : "bootstrap", - "Files" : [ - { - "Folder" : "ecc", - "Files" : [ - "Makefile" - ] - }, - { - "Folder" : "ecere", - "Files" : [ - "Makefile" - ] - }, - { - "Folder" : "ecp", - "Files" : [ - "Makefile" - ] - }, - { - "Folder" : "ecs", - "Files" : [ - "Makefile" - ] - }, - { - "Folder" : "libec", - "Files" : [ - "Makefile" - ] - }, - "Makefile" - ] - }, - { - "Folder" : "ecc", - "Files" : [ - "Makefile", - "Makefile.bootstrap" - ] - }, - { - "Folder" : "ecp", - "Files" : [ - "Makefile", - "Makefile.bootstrap" - ] - }, - { - "Folder" : "ecs", - "Files" : [ - "Makefile", - "Makefile.bootstrap" - ] - }, - { - "Folder" : "libec", - "Files" : [ - "Makefile", - "Makefile.bootstrap" - ] - }, - "Makefile" - ], - "Options" : { - "ExcludeFromBuild" : true - } - }, - { - "Folder" : "deps", - "Files" : [ - { - "Folder" : "freetype-2.3.12", - "Files" : [ - "Makefile" - ] - }, - { - "Folder" : "jpeg-9a", - "Files" : [ - "Makefile" - ] - }, - { - "Folder" : "libffi-3.0.11", - "Files" : [ - "Makefile" - ] - }, - { - "Folder" : "libpng-1.6.12", - "Files" : [ - "Makefile" - ] - }, - { - "Folder" : "libungif-4.1.1", - "Files" : [ - "Makefile" - ] - }, - { - "Folder" : "zlib-1.2.8", - "Files" : [ - "Makefile" - ] - }, - "Makefile" - ], - "Options" : { - "ExcludeFromBuild" : true - } - }, - { - "Folder" : "documentor", - "Files" : [ - "Makefile" - ], - "Options" : { - "ExcludeFromBuild" : true - } - }, - { - "Folder" : "ear", - "Files" : [ - { - "Folder" : "cmd", - "Files" : [ - "Makefile" - ] - }, - { - "Folder" : "extract", - "Files" : [ - "Makefile" - ] - }, - "Makefile" - ], - "Options" : { - "ExcludeFromBuild" : true - } - }, - { - "Folder" : "ecere", - "Files" : [ - "Makefile", - "Makefile.bootstrap", - "Makefile.ecereCOM", - "Makefile.vanilla" - ], - "Options" : { - "ExcludeFromBuild" : true - } - }, - { - "Folder" : "eda", - "Files" : [ - { - "Folder" : "drivers", - "Files" : [ - { - "Folder" : "sqlite", - "Files" : [ - "Makefile" - ] - }, - { - "Folder" : "sqliteCipher", - "Files" : [ - "Makefile" - ] - } - ] - }, - { - "Folder" : "libeda", - "Files" : [ - "Makefile" - ] - }, - "Makefile" - ], - "Options" : { - "ExcludeFromBuild" : true - } - }, - { - "Folder" : "epj2make", - "Files" : [ - "Makefile" - ], - "Options" : { - "ExcludeFromBuild" : true - } - }, - { - "Folder" : "ide", - "Files" : [ - "Makefile" - ], - "Options" : { - "ExcludeFromBuild" : true - } - }, - { - "FileName" : "crossplatform.mk", - "Options" : { - "ExcludeFromBuild" : true - } - }, - "default.cf", - "Makefile" - ], - "ResourcesPath" : "", - "Resources" : [ - - ] -} diff --git a/compiler/bootstrap/Makefile b/compiler/bootstrap/Makefile index 28a685e..06d8d4d 100644 --- a/compiler/bootstrap/Makefile +++ b/compiler/bootstrap/Makefile @@ -49,7 +49,7 @@ distclean: cleantarget ecere: @$(call echo,Building ecere...) cd ecere && $(MAKE) - + libec: @$(call echo,Building ec...) cd libec && $(MAKE) -- 1.8.3.1