Respect LDFLAGS

This commit is contained in:
James Le Cuirot
2020-04-26 17:23:02 +01:00
parent 34c0c7af02
commit cf6e360a7e
2 changed files with 12 additions and 10 deletions

View File

@@ -5,6 +5,7 @@ CC = @CC@
LEX = @LEX@
YACC = @YACC@
CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@
DEFS = @DEFS@
ALL_CFLAGS = -Wall -I. -I@srcdir@ -I@srcdir@/libami $(DEFS) $(CFLAGS) @X_CFLAGS@
LIBS = @X_LIBS@ @X_PRE_LIBS@ -Llibami -lami @XT_LIB_KLUDGE@ -lXext -lXmu \
@@ -148,34 +149,34 @@ cde-install: Xresources.amiwm Amilogo.bm Amilogo.pm
amiwm: $(OBJS) $(LIBAMI)
$(CC) -o amiwm $(OBJS) $(LIBS)
$(CC) $(LDFLAGS) -o amiwm $(OBJS) $(LIBS)
requestchoice: requestchoice.o $(LIBAMI)
$(CC) -o requestchoice requestchoice.o $(LIBS)
$(CC) $(LDFLAGS) -o requestchoice requestchoice.o $(LIBS)
config_util: config_util.o $(LIBAMI)
$(CC) -o config_util config_util.o $(LIBS)
$(CC) $(LDFLAGS) -o config_util config_util.o $(LIBS)
executecmd: executecmd.o $(LIBAMI)
$(CC) -o executecmd executecmd.o $(LIBS)
$(CC) $(LDFLAGS) -o executecmd executecmd.o $(LIBS)
Filesystem: filesystem.o $(LIBAMI)
$(CC) -o Filesystem filesystem.o $(LIBS)
$(CC) $(LDFLAGS) -o Filesystem filesystem.o $(LIBS)
Keyboard: kbdmodule.o kbdlexer.o $(LIBAMI)
$(CC) -o Keyboard kbdmodule.o kbdlexer.o $(LIBS)
$(CC) $(LDFLAGS) -o Keyboard kbdmodule.o kbdlexer.o $(LIBS)
Battery: battery_module.o $(LIBAMI)
$(CC) -o Battery battery_module.o $(LIBS)
$(CC) $(LDFLAGS) -o Battery battery_module.o $(LIBS)
Launcher: launchermodule.o $(LIBAMI)
$(CC) -o Launcher launchermodule.o $(LIBS)
$(CC) $(LDFLAGS) -o Launcher launchermodule.o $(LIBS)
ppmtoinfo: ppmtoinfo.o
$(CC) -o ppmtoinfo ppmtoinfo.o -lm
$(CC) $(LDFLAGS) -o ppmtoinfo ppmtoinfo.o -lm
localetest: localetest.o $(LIBAMI)
$(CC) -o localetest localetest.o $(LIBS)
$(CC) $(LDFLAGS) -o localetest localetest.o $(LIBS)
clean: lib_clean
$(RM) core $(PROGS) $(LIBAMI) Keyboard Battery Launcher *.o

View File

@@ -6,6 +6,7 @@ LEX = @LEX@
YACC = @YACC@
RANLIB = @RANLIB@
CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@
DEFS = @DEFS@
ALL_CFLAGS = -Wall -I@srcdir@ -I@top_srcdir@ $(DEFS) $(CFLAGS) @X_CFLAGS@
LIBS = @X_LIBS@ @X_PRE_LIBS@ -lXext -lXmu -lX11 @X_EXTRA_LIBS@ @LIBS@