aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--desiredata/src/configure.in10
-rw-r--r--desiredata/src/makefile.in20
2 files changed, 10 insertions, 20 deletions
diff --git a/desiredata/src/configure.in b/desiredata/src/configure.in
index 106dd3e6..5c588358 100644
--- a/desiredata/src/configure.in
+++ b/desiredata/src/configure.in
@@ -25,8 +25,6 @@ AC_SUBST(WATCHDOG)
AC_SUBST(WLIB)
AC_SUBST(EXE)
AC_SUBST(WSTRIP)
-AC_SUBST(PDSEND)
-AC_SUBST(PDRECEIVE)
AC_SUBST(STRIP)
AC_CONFIG_HEADERS([config.h:config.h.in])
@@ -87,8 +85,6 @@ if test `uname -s` = Linux; then
WATCHDOG=pd-watchdog
EXE=""
WSTRIP=""
- PDRECEIVE=pdreceive
- PDSEND=pdsend
fi
if test `uname -s` = Darwin; then
@@ -117,8 +113,6 @@ if test `uname -s` = Darwin; then
WATCHDOG=pd-watchdog
EXE=""
WSTRIP=""
- PDRECEIVE=pdreceive
- PDSEND=pdsend
fi
if test `uname -s | cut -f1 -d_` = CYGWIN; then
@@ -131,8 +125,6 @@ if test `uname -s | cut -f1 -d_` = CYGWIN; then
LDSOFLAGS="-shared"
EXE=.exe
WSTRIP=""
- PDRECEIVE=pdreceive
- PDSEND=pdsend
fi
if test `uname -s | cut -f1 -d_` = MINGW32; then
@@ -150,8 +142,6 @@ if test `uname -s | cut -f1 -d_` = MINGW32; then
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
diff --git a/desiredata/src/makefile.in b/desiredata/src/makefile.in
index 3af3b104..c973731e 100644
--- a/desiredata/src/makefile.in
+++ b/desiredata/src/makefile.in
@@ -31,8 +31,6 @@ STRIP = @STRIP@
WATCHDOG = @WATCHDOG@
WLIB = @WLIB@
EXE = @EXE@
-PDSEND = @PDSEND@
-PDRECEIVE = @PDRECEIVE@
# variables to build on mingw <colet.patrice@free.fr>
#-----------------------------------------------------------
@@ -59,8 +57,8 @@ $(SRC:.c=.o): %.o: %.c config.log
$(SO): $(OBJ) config.log
$(CXX) $(LDSOFLAGS) $(LDFLAGS) $(DBG_CFLAGS) -I../src -o $(SO) $(OBJ) $(WLIB)
-pd: $(OBJ) config.log $(SO) main.c
- $(CXX) $(LDFLAGS) $(DBG_CFLAGS) $$PWD/$(SO) main.c -o pd
+pd$(EXE): $(OBJ) config.log $(SO) main.c
+ $(CXX) $(LDFLAGS) $(DBG_CFLAGS) $$PWD/$(SO) main.c -o pd$(EXE)
pd-watchdog: s_watchdog.c
$(CC) $(CFLAGS) $(STRIPFLAG) -o pd-watchdog s_watchdog.c
@@ -70,13 +68,15 @@ pd.com: main.o
$(LIBS) -L../src -lpd
strip --strip-unneeded -R .note -R .comment pd.com
-pdsend: u_pdsend.c
- $(CC) $(CFLAGS) $(STRIPFLAG) -o pdsend u_pdsend.c
- $(STRIP) pdsend
+# i should sort out the LDFLAGS thing so that pd,pdsend,pdreceive don't get linked to all libs that libpd.so is linked to.
-pdreceive: u_pdreceive.c
- $(CC) $(CFLAGS) $(STRIPFLAG) -o pdreceive u_pdreceive.c
- $(STRIP) pdreceive
+pdsend$(EXE): u_pdsend.c
+ $(CC) $(CFLAGS) $(STRIPFLAG) $(LDFLAGS) -o pdsend$(EXE) u_pdsend.c
+ $(STRIP) pdsend$(EXE)
+
+pdreceive$(EXE): u_pdreceive.c
+ $(CC) $(CFLAGS) $(STRIPFLAG) $(LDFLAGS) -o pdreceive$(EXE) u_pdreceive.c
+ $(STRIP) pdreceive$(EXE)
externs::
cd ../extra; for ext in bonk~ choice expr~ fiddle~ loop~ lrshift~ pique sigmund~; do \