d0p1/tcc-stupidos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Makefile fixup:

Browse source 
* additional make target for lib/tcc1.def on non-win32 builds
  tcc1.def was formerly lib/libtcc1.a but has bee made into its
  own Makefile target, tcc1.def

* use mv instead of cp on config.h
  this fixes a mistake I made which caused Makefile to rebuild
  all targets every time

* make links from libtcc.so.1.0 to libtcc.so.1 and libtcc.so
This commit is contained in:
Henry Kroll III 2010-04-25 13:34:02 -07:00
parent 07eb850608
commit 765992396f
2 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
Makefile
View file

@ -10,15 +10,16 @@ CFLAGS_P=$(CFLAGS) -pg -static -DCONFIG_TCC_STATIC
LIBS_P= LIBS_P=
LIBS=. LIBS=.
LIBTCCA=libtcc.a LIBTCCB=libtcc.a
ifdef DISABLE_STATIC ifdef DISABLE_STATIC
CFLAGS+=-fPIC CFLAGS+=-fPIC
LIBTCCA=
LIBTCCL=-L. -ltcc LIBTCCL=-L. -ltcc
LIBTCCSO=libtcc.so.1 LIBTCCB=libtcc.so.1.0
endif
LIBTCCPROGS=$(LIBTCCB)
ifndef CONFIG_WIN32
LIBTCCPROGS+=tcc1.def
endif endif
LIBTCCB=$(LIBTCCA)
LIBTCCB+=$(LIBTCCSO)
ifneq ($(GCC_MAJOR),2) ifneq ($(GCC_MAJOR),2)
CFLAGS+=-fno-strict-aliasing CFLAGS+=-fno-strict-aliasing
@ -128,7 +129,7 @@ ifdef CONFIG_CROSS
PROGS+=$(PROGS_CROSS) PROGS+=$(PROGS_CROSS)
endif endif
all: $(PROGS) $(LIBTCC1) $(BCHECK_O) $(LIBTCCB) tcc-doc.html tcc.1 libtcc_test$(EXESUF) all: $(PROGS) $(LIBTCC1) $(BCHECK_O) $(LIBTCCPROGS) tcc-doc.html tcc.1 libtcc_test$(EXESUF)
# Host Tiny C Compiler # Host Tiny C Compiler
tcc$(EXESUF): tcc.o $(LIBTCCB) tcc$(EXESUF): tcc.o $(LIBTCCB)
@ -174,31 +175,32 @@ $(LIBTCC_OBJ) tcc.o : %.o : %.c $(LIBTCC_INC)
libtcc.a: $(LIBTCC_OBJ) libtcc.a: $(LIBTCC_OBJ)
$(AR) rcs $@ $^ $(AR) rcs $@ $^
libtcc.so.1: $(LIBTCC_OBJ) libtcc.so.1.0: $(LIBTCC_OBJ)
$(CC) -shared -Wl,-soname,$@ -o $@.0 $^ $(CC) -shared -Wl,-soname,$@ -o $@ $^
ln -sf libtcc.so.1.0 libtcc.so.1 ln -sf libtcc.so.1.0 libtcc.so.1
ln -sf libtcc.so.1.0 libtcc.so ln -sf libtcc.so.1.0 libtcc.so
libtcc_test$(EXESUF): tests/libtcc_test.c $(LIBTCCB) libtcc_test$(EXESUF): tests/libtcc_test.c $(LIBTCCB)
$(CC) -o $@ $^ -I. $(CFLAGS) $(LIBS) $(LIBTCCL) $(CC) -o $@ $^ -I. $(CFLAGS) $(LIBS) $(LIBTCCL)
ifdef CONFIG_CROSS
ifndef CONFIG_WIN32 tcc1.def:
cp config.mak config.mak.bak mv config.mak config.mak.bak
cp config.h config.h.bak mv config.h config.h.bak
cp config.h.bak config.h
cp config.mak.bak config.mak
echo "ARCH=i386" >> config.mak echo "ARCH=i386" >> config.mak
echo "#undef HOST_X86_64" >> config.h echo "#undef HOST_X86_64" >> config.h
echo "#define HOST_I386 1" >> config.h echo "#define HOST_I386 1" >> config.h
echo "CFLAGS=-O2 -g -pipe -Wall -m32" >> config.mak echo "CFLAGS=-O2 -g -pipe -Wall -m32" >> config.mak
echo "ARCH=i386" >> config.mak
make i386-win32-tcc make i386-win32-tcc
cp i386-win32-tcc tcc.exe cp i386-win32-tcc tcc.exe
mv libtcc1.a libtcc1.bak mv libtcc1.a libtcc1.bak
make CONFIG_WIN32=1 libtcc1.a make CONFIG_WIN32=1 libtcc1.a
mv libtcc1.a lib mv libtcc1.a lib/tcc1.def
mv libtcc1.bak libtcc1.a mv libtcc1.bak libtcc1.a
mv config.mak.bak config.mak mv config.mak.bak config.mak
mv config.h.bak config.h mv config.h.bak config.h
endif
endif
libtest: libtcc_test$(EXESUF) $(LIBTCC1) libtest: libtcc_test$(EXESUF) $(LIBTCC1)
./libtcc_test$(EXESUF) lib_path=. ./libtcc_test$(EXESUF) lib_path=.
@ -238,7 +240,7 @@ TCC_INCLUDES = stdarg.h stddef.h stdbool.h float.h varargs.h tcclib.h
INSTALL=install INSTALL=install
ifndef CONFIG_WIN32 ifndef CONFIG_WIN32
install: $(PROGS) $(LIBTCC1) $(BCHECK_O) $(LIBTCCB) tcc.1 tcc-doc.html install: $(PROGS) $(LIBTCC1) $(BCHECK_O) $(LIBTCCPROGS) tcc.1 tcc-doc.html
mkdir -p "$(bindir)" mkdir -p "$(bindir)"
$(INSTALL) -s -m755 $(PROGS) "$(bindir)" $(INSTALL) -s -m755 $(PROGS) "$(bindir)"
mkdir -p "$(mandir)/man1" mkdir -p "$(mandir)/man1"
@ -253,10 +255,10 @@ ifneq ($(BCHECK_O),)
endif endif
$(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(tccdir)/include" $(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(tccdir)/include"
mkdir -p "$(libdir)" mkdir -p "$(libdir)"
$(INSTALL) -m644 $(LIBTCCB) "$(libdir)" $(INSTALL) -m755 $(LIBTCCB) "$(libdir)"
ifeq ($(LIBTCCB),$(LIBTCCSO)) ifdef DISABLE_STATIC
$(INSTALL) -m644 $(LIBTCCB,.1.0=.1) "$(libdir)" ln -sf "$(ln_libdir)/libtcc.so.1.0" "$(libdir)/libtcc.so.1"
$(INSTALL) -m644 $(LIBTCCB,.1.0=) "$(libdir)" ln -sf "$(ln_libdir)/libtcc.so.1.0" "$(libdir)/libtcc.so"
endif endif
mkdir -p "$(includedir)" mkdir -p "$(includedir)"
$(INSTALL) -m644 libtcc.h "$(includedir)" $(INSTALL) -m644 libtcc.h "$(includedir)"
@ -264,7 +266,7 @@ endif
$(INSTALL) -m644 tcc-doc.html "$(docdir)" $(INSTALL) -m644 tcc-doc.html "$(docdir)"
ifdef CONFIG_CROSS ifdef CONFIG_CROSS
mkdir -p "$(tccdir)/lib" mkdir -p "$(tccdir)/lib"
$(INSTALL) -m644 win32/lib/*.def lib/libtcc1.a "$(tccdir)/lib" $(INSTALL) -m644 win32/lib/*.def lib/tcc1.def "$(tccdir)/lib"
cp -r win32/include/. "$(tccdir)/include" cp -r win32/include/. "$(tccdir)/include"
cp -r win32/examples/. "$(tccdir)/examples" cp -r win32/examples/. "$(tccdir)/examples"
endif endif
@ -275,8 +277,8 @@ uninstall:
rm -fv $(foreach P,$(TCC_INCLUDES),"$(tccdir)/include/$P") rm -fv $(foreach P,$(TCC_INCLUDES),"$(tccdir)/include/$P")
rm -fv "$(docdir)/tcc-doc.html" "$(mandir)/man1/tcc.1" rm -fv "$(docdir)/tcc-doc.html" "$(mandir)/man1/tcc.1"
rm -fv "$(libdir)/$(LIBTCCB)" "$(includedir)/libtcc.h" rm -fv "$(libdir)/$(LIBTCCB)" "$(includedir)/libtcc.h"
ifeq ($(LIBTCCB),$(LIBTCCSO)) ifdef DISABLE_STATIC
rm -fv "$(libdir)/$(LIBTCCB,.1.0=.1)" "$(libdir)/$(LIBTCCB,.1.0=)" rm -fv "$(libdir)/libtcc.so*"
endif endif
ifdef CONFIG_CROSS ifdef CONFIG_CROSS
rm -rf "$(tccdir)/include" rm -rf "$(tccdir)/include"

1
configure vendored
View file

@ -301,6 +301,7 @@ echo "prefix=$prefix" >> config.mak
echo "bindir=\$(DESTDIR)$bindir" >> config.mak echo "bindir=\$(DESTDIR)$bindir" >> config.mak
echo "tccdir=\$(DESTDIR)$tccdir" >> config.mak echo "tccdir=\$(DESTDIR)$tccdir" >> config.mak
echo "libdir=\$(DESTDIR)$libdir" >> config.mak echo "libdir=\$(DESTDIR)$libdir" >> config.mak
echo "ln_libdir=$libdir" >> config.mak
echo "includedir=\$(DESTDIR)$includedir" >> config.mak echo "includedir=\$(DESTDIR)$includedir" >> config.mak
echo "mandir=\$(DESTDIR)$mandir" >> config.mak echo "mandir=\$(DESTDIR)$mandir" >> config.mak
echo "docdir=\$(DESTDIR)$docdir" >> config.mak echo "docdir=\$(DESTDIR)$docdir" >> config.mak