aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--desiredata/src/configure.in46
-rw-r--r--desiredata/src/makefile.in12
2 files changed, 26 insertions, 32 deletions
diff --git a/desiredata/src/configure.in b/desiredata/src/configure.in
index 8bccc44a..106dd3e6 100644
--- a/desiredata/src/configure.in
+++ b/desiredata/src/configure.in
@@ -27,13 +27,7 @@ AC_SUBST(EXE)
AC_SUBST(WSTRIP)
AC_SUBST(PDSEND)
AC_SUBST(PDRECEIVE)
-
-AC_SUBST(WATCHDOG)
-AC_SUBST(WLIB)
-AC_SUBST(WEXE)
-AC_SUBST(EXE)
-AC_SUBST(PDSEND)
-AC_SUBST(PDRECEIVE)
+AC_SUBST(STRIP)
AC_CONFIG_HEADERS([config.h:config.h.in])
@@ -78,6 +72,9 @@ AC_CHECK_FUNCS(vasprintf)
AUDIOSRC=""
MIDISRC="s_midi_none.c"
+WLIB=""
+STRIP="meuhhhhh"
+
if test `uname -s` = Linux; then
LDFLAGS="-Wl,-export-dynamic "
EXT=pd_linux
@@ -89,7 +86,6 @@ if test `uname -s` = Linux; then
LDSOFLAGS="-shared"
WATCHDOG=pd-watchdog
EXE=""
- WLIB=""
WSTRIP=""
PDRECEIVE=pdreceive
PDSEND=pdsend
@@ -120,7 +116,6 @@ if test `uname -s` = Darwin; then
# fi
WATCHDOG=pd-watchdog
EXE=""
- WLIB=""
WSTRIP=""
PDRECEIVE=pdreceive
PDSEND=pdsend
@@ -134,11 +129,10 @@ if test `uname -s | cut -f1 -d_` = CYGWIN; then
MORECFLAGS="-fno-strict-aliasing"
STRIPFLAG=-s
LDSOFLAGS="-shared"
- WLIB=""
- EXE=.exe
- WSTRIP=""
- PDRECEIVE=pdreceive
- PDSEND=pdsend
+ EXE=.exe
+ WSTRIP=""
+ PDRECEIVE=pdreceive
+ PDSEND=pdsend
fi
if test `uname -s | cut -f1 -d_` = MINGW32; then
@@ -146,23 +140,21 @@ if test `uname -s | cut -f1 -d_` = MINGW32; then
EXT=dll
LIBSUFFIX=.dll
CPPFLAGS="-DMSW \
-# -DUSEAPI_MMIO \
-# -DUSE_PORTAUDIO \
-DPD_INTERNAL -DPD "
MORECFLAGS="-mms-bitfields"
STRIPFLAG=-s
LDSOFLAGS="-shared"
-# AUDIOSRC="s_audio_mmio.c"
- MIDISRC="s_midi_mmio.c"
-
- STRIP="strip --strip-unneeded -R .note -R .comment"
- EXPORT="-Wl, --export-all-symbols -Wl, --out-implib=pd.a"
- WLIB=$WLIB"$LDFLAGS $EXPORT; $STRIP libpd.dll"
- PDRECEIVE="$LDFLAGS; $STRIP pdreceive.exe"
- PDSEND="$LDFLAGS; $STRIP pdsend.exe"
- EXE=.exe
- WATCHDOG=pd.com
- WSTRIP=$STRIP $DESTDIR$bindir/pd.exe
+# AUDIOSRC="s_audio_mmio.c"
+ MIDISRC="s_midi_mmio.c"
+
+ STRIP="strip --strip-unneeded -R .note -R .comment"
+ EXPORT="-Wl, --export-all-symbols -Wl, --out-implib=pd.a"
+ WLIB=$WLIB"$LDFLAGS $EXPORT; $STRIP libpd.dll"
+ PDRECEIVE="$LDFLAGS; $STRIP pdreceive.exe"
+ PDSEND="$LDFLAGS; $STRIP pdsend.exe"
+ EXE=.exe
+ WATCHDOG=pd.com
+ WSTRIP=$STRIP $DESTDIR$bindir/pd.exe
fi
if test `uname -m` = x86_64; then
diff --git a/desiredata/src/makefile.in b/desiredata/src/makefile.in
index 64675070..3af3b104 100644
--- a/desiredata/src/makefile.in
+++ b/desiredata/src/makefile.in
@@ -25,11 +25,11 @@ CFLAGS = $(CPPFLAGS) @CFLAGS@ $(MORECFLAGS)
CFLAGS += -Wall -Wextra -Wno-unused-parameter -I.
CFLAGS += -DINSTALL_PREFIX=\"$(prefix)\"
+STRIP = @STRIP@
# --------------------- win32 ---------------------------
WATCHDOG = @WATCHDOG@
WLIB = @WLIB@
-WEXE = @WEXE@
EXE = @EXE@
PDSEND = @PDSEND@
PDRECEIVE = @PDRECEIVE@
@@ -68,19 +68,21 @@ pd-watchdog: s_watchdog.c
pd.com: main.o
$(CC) $(LDFLAGS) $(DBG_CFLAGS) $(CFLAGS) -o pd.com main.o \
$(LIBS) -L../src -lpd
- strip --strip-unneeded -R .note -R .comment pd.com
+ strip --strip-unneeded -R .note -R .comment pd.com
pdsend: u_pdsend.c
- $(CC) $(CFLAGS) $(STRIPFLAG) -o pdsend u_pdsend.c $(PDSEND)
+ $(CC) $(CFLAGS) $(STRIPFLAG) -o pdsend u_pdsend.c
+ $(STRIP) pdsend
pdreceive: u_pdreceive.c
- $(CC) $(CFLAGS) $(STRIPFLAG) -o pdreceive u_pdreceive.c $(PDRECEIVE)
+ $(CC) $(CFLAGS) $(STRIPFLAG) -o pdreceive u_pdreceive.c
+ $(STRIP) pdreceive
externs::
cd ../extra; for ext in bonk~ choice expr~ fiddle~ loop~ lrshift~ pique sigmund~; do \
cd $$ext; make @EXTERNTARGET@ || break; cd ..; done
-install:: all
+install:: all
install -d $(DESTDIR)$(bindir)
install -d $(DESTDIR)$(libpdbindir)
for file in defaults.ddrc pkgIndex.tcl poe.tcl bgerror.tcl; do \