drop ccwrp.sh

debian/dj64-dev.install

@@ -1,9 +1,6 @@
 usr/i386-pc-dj64/include
 usr/i386-pc-dj64/lib/*.o
 usr/i386-pc-dj64/lib64/*.so
-usr/i386-pc-dj64/bin/*
 usr/i386-pc-dj64/share/*
-usr/bin/*
 usr/share/pkgconfig/dj64.pc
-usr/share/man/man1/*
 usr/share/doc/dj64/*

dj64.mk

@@ -9,16 +9,18 @@ ifeq ($(shell $(DJ64AS) --version 2>/dev/null),)
 ifneq ($(filter x86_64 amd64,$(shell uname -m)),)
 CROSS_PREFIX :=
 ifeq ($(shell $(DJ64AS) --version 2>/dev/null),)
-# found nothing, allow dj64-gcc to use defaults
-DJ64AS =
-DJ64ASFLAGS =
+# found nothing, try built-in assembler
+DJ64AS = $(CC) -x assembler
+DJ64ASFLAGS = -m32 -Wa,-defsym,_DJ64=1 -c
 endif
 else
 $(error cross-binutils not installed)
 endif
 endif
-export DJ64AS
-export DJ64ASFLAGS
+
+DJ64CFLAGS = $(shell pkg-config --cflags dj64)
+XCPPFLAGS = $(shell pkg-config --variable=xcppflags dj64)
+ASCPPFLAGS = $(shell pkg-config --variable=cppflags dj64)
 
 XSTRIP = $(CROSS_PREFIX)strip --strip-debug
 XLD = $(CROSS_PREFIX)ld
@@ -86,11 +88,14 @@ $(DJ64_XLIB): $(OBJECTS)
 	$(LD) $^ $(DJLDFLAGS) -o $@
 
 %.o: %.c
-	dj64-gcc $(CFLAGS) -I. -o $@ -c $<
+	$(CC) $(DJ64CFLAGS) $(XCPPFLAGS) $(CFLAGS) -I. -o $@ -c $<
 %.o: %.S
-	dj64-gcc -o $@ -c $<
+	$(CPP) -x assembler-with-cpp $(ASCPPFLAGS) $< | \
+	    $(DJ64AS) $(DJ64ASFLAGS) -o $@ -
 plt.o: plt.inc $(GLOB_ASM)
-	echo "#include <dj64/plt.S.inc>" | dj64-gcc -I. -o $@ -c -
+	echo "#include <dj64/plt.S.inc>" | \
+	    $(CPP) -x assembler-with-cpp $(ASCPPFLAGS) -I. - | \
+	    $(DJ64AS) $(DJ64ASFLAGS) -o $@ -
 thunks_c.o: thunk_calls.h
 thunks_p.o: thunk_asms.h plt_asmc.h
 

dj64.spec.rpkg

@@ -80,11 +80,8 @@ This package contains tools and headers for building dj64-enabled programs.
 %{_prefix}/i386-pc-dj64/include
 %{_prefix}/i386-pc-dj64/lib/*.o
 %{_prefix}/i386-pc-dj64/lib64/*.so
-%{_prefix}/i386-pc-dj64/bin/*
 %{_prefix}/i386-pc-dj64/share/*
-%{_bindir}/*
 %{_datadir}/pkgconfig/dj64.pc
-%{_mandir}/man1/*
 %{_docdir}/dj64
 %end
 

makefile

@@ -74,19 +74,13 @@ install_dj64:
 	$(INSTALL) -m 0644 $(DJ64LIBS) $(DESTDIR)$(PREFIX)/i386-pc-dj64/lib64
 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/i386-pc-dj64/include
 	cp -r $(TOP)/include $(DESTDIR)$(PREFIX)/i386-pc-dj64
-	$(INSTALL) -d $(DESTDIR)$(PREFIX)/i386-pc-dj64/bin
-	$(INSTALL) -m 0755 bin/ccwrp.sh $(DESTDIR)$(PREFIX)/i386-pc-dj64/bin
 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/i386-pc-dj64/share
 	$(INSTALL) -m 0644 dj64.mk $(DESTDIR)$(PREFIX)/i386-pc-dj64/share
-	$(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
-	ln -sf ../i386-pc-dj64/bin/ccwrp.sh $(DESTDIR)$(PREFIX)/bin/dj64-gcc
 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share
 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/pkgconfig
 	$(INSTALL) -m 0644 dj64.pc $(DESTDIR)$(PREFIX)/share/pkgconfig
 	$(INSTALL) -m 0644 dj64_s.pc $(DESTDIR)$(PREFIX)/share/pkgconfig
 	$(INSTALL) -m 0644 dj64static.pc $(DESTDIR)$(PREFIX)/share/pkgconfig
-	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/man/man1
-	$(INSTALL) -m 0644 man/*.1 $(DESTDIR)$(PREFIX)/share/man/man1
 
 install_djdev64:
 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share