Re-generated Makefiles and compiling with -pedantic
This commit is contained in:
parent
7089a849e2
commit
1f0a0f014d
5
Makefile
5
Makefile
|
@ -2,7 +2,7 @@ PACKAGE = GToolkit
|
||||||
VERSION = 0.0.0
|
VERSION = 0.0.0
|
||||||
SUBDIRS = src
|
SUBDIRS = src
|
||||||
RM = rm -f
|
RM = rm -f
|
||||||
LN = ln -sf
|
LN = ln -f
|
||||||
TAR = tar -czvf
|
TAR = tar -czvf
|
||||||
|
|
||||||
|
|
||||||
|
@ -19,12 +19,11 @@ distclean:
|
||||||
|
|
||||||
dist:
|
dist:
|
||||||
$(RM) -r $(PACKAGE)-$(VERSION)
|
$(RM) -r $(PACKAGE)-$(VERSION)
|
||||||
$(LN) . $(PACKAGE)-$(VERSION)
|
$(LN) -s . $(PACKAGE)-$(VERSION)
|
||||||
@$(TAR) $(PACKAGE)-$(VERSION).tar.gz \
|
@$(TAR) $(PACKAGE)-$(VERSION).tar.gz \
|
||||||
$(PACKAGE)-$(VERSION)/src/common.c \
|
$(PACKAGE)-$(VERSION)/src/common.c \
|
||||||
$(PACKAGE)-$(VERSION)/src/gwindow.c \
|
$(PACKAGE)-$(VERSION)/src/gwindow.c \
|
||||||
$(PACKAGE)-$(VERSION)/src/gtoolkit.c \
|
$(PACKAGE)-$(VERSION)/src/gtoolkit.c \
|
||||||
$(PACKAGE)-$(VERSION)/src/test.c \
|
|
||||||
$(PACKAGE)-$(VERSION)/src/project.conf \
|
$(PACKAGE)-$(VERSION)/src/project.conf \
|
||||||
$(PACKAGE)-$(VERSION)/Makefile \
|
$(PACKAGE)-$(VERSION)/Makefile \
|
||||||
$(PACKAGE)-$(VERSION)/project.conf
|
$(PACKAGE)-$(VERSION)/project.conf
|
||||||
|
|
16
src/Makefile
16
src/Makefile
|
@ -3,13 +3,15 @@ PREFIX = /usr/local
|
||||||
DESTDIR =
|
DESTDIR =
|
||||||
LIBDIR = $(PREFIX)/lib
|
LIBDIR = $(PREFIX)/lib
|
||||||
CC = cc
|
CC = cc
|
||||||
|
CPPFLAGSF=
|
||||||
CPPFLAGS=
|
CPPFLAGS=
|
||||||
CFLAGSF = -W -I ../include
|
CFLAGSF = -W -I ../include
|
||||||
CFLAGS = -Wall -fPIC -g -O2 -ansi
|
CFLAGS = -Wall -fPIC -g -O2 -pedantic
|
||||||
AR = ar -rc
|
AR = ar -rc
|
||||||
RANLIB = ranlib
|
RANLIB = ranlib
|
||||||
LD = ld -shared
|
LD = $(CC) -shared
|
||||||
RM = rm -f
|
RM = rm -f
|
||||||
|
LN = ln -f
|
||||||
MKDIR = mkdir -p
|
MKDIR = mkdir -p
|
||||||
INSTALL = install
|
INSTALL = install
|
||||||
|
|
||||||
|
@ -17,14 +19,15 @@ INSTALL = install
|
||||||
all: $(TARGETS)
|
all: $(TARGETS)
|
||||||
|
|
||||||
libGToolkit_OBJS = common.o gwindow.o gtoolkit.o
|
libGToolkit_OBJS = common.o gwindow.o gtoolkit.o
|
||||||
libGToolkit_CFLAGS = $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
|
libGToolkit_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
|
||||||
|
libGToolkit_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
|
||||||
|
|
||||||
libGToolkit.a: $(libGToolkit_OBJS)
|
libGToolkit.a: $(libGToolkit_OBJS)
|
||||||
$(AR) libGToolkit.a $(libGToolkit_OBJS)
|
$(AR) libGToolkit.a $(libGToolkit_OBJS)
|
||||||
$(RANLIB) libGToolkit.a
|
$(RANLIB) libGToolkit.a
|
||||||
|
|
||||||
libGToolkit.so: $(libGToolkit_OBJS)
|
libGToolkit.so: $(libGToolkit_OBJS)
|
||||||
$(LD) -o libGToolkit.so $(libGToolkit_OBJS)
|
$(LD) -o libGToolkit.so -Wl,-soname,libGToolkit.so.0 $(libGToolkit_OBJS)
|
||||||
|
|
||||||
common.o: common.c
|
common.o: common.c
|
||||||
$(CC) $(libGToolkit_CFLAGS) -c common.c
|
$(CC) $(libGToolkit_CFLAGS) -c common.c
|
||||||
|
@ -42,12 +45,7 @@ distclean: clean
|
||||||
$(RM) $(TARGETS)
|
$(RM) $(TARGETS)
|
||||||
|
|
||||||
install: all
|
install: all
|
||||||
$(MKDIR) $(DESTDIR)$(LIBDIR)
|
|
||||||
$(INSTALL) -m 0644 libGToolkit.a $(DESTDIR)$(LIBDIR)/libGToolkit.a
|
|
||||||
$(INSTALL) -m 0755 libGToolkit.so $(DESTDIR)$(LIBDIR)/libGToolkit.so
|
|
||||||
|
|
||||||
uninstall:
|
uninstall:
|
||||||
$(RM) $(DESTDIR)$(LIBDIR)/libGToolkit.a
|
|
||||||
$(RM) $(DESTDIR)$(LIBDIR)/libGToolkit.so
|
|
||||||
|
|
||||||
.PHONY: all clean distclean install uninstall
|
.PHONY: all clean distclean install uninstall
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#targets=libGToolkit,test
|
#targets=libGToolkit,test
|
||||||
targets=libGToolkit
|
targets=libGToolkit
|
||||||
cflags_force=-W -I ../include
|
cflags_force=-W -I ../include
|
||||||
cflags=-Wall -fPIC -g -O2 -ansi
|
cflags=-Wall -fPIC -g -O2 -pedantic
|
||||||
|
|
||||||
[libGToolkit]
|
[libGToolkit]
|
||||||
type=library
|
type=library
|
||||||
|
|
Loading…
Reference in New Issue
Block a user